Improve ADM import support from 3rd party tools #259

firthm01 · 2023-11-11T20:54:14Z

Need to be able to support supplementary packformats within the software for DS layouts.

Factor out the remaining code which uses the fixed speaker layout list and references them by index
- Use a PF ID thoughout to improve robustness and maintainability
- Can use the common definition helper class to provide the info required to replace this. Follow a similar workflow as the HOA plugin. This doesn't have fixed options - it uses the common definition helper to query available HOA configs. Use a similar process to work out supported speaker layouts
Turn the common definition helper in to a more generic "preset definitions" helper which supports the common definitions as well as any other supplementary definitions we want to stick in there
- Figure out and add the necessary PF/CF definitions to support import of ADM from third-party tools
Update import code - currently it will only look for packformats by their ID. Third-party tools don't use consistent IDs for custom PFs - need to match by contained CFs instead
Update export code - currently it expects all non-Obj types to use common defs. This means it cuts out a whole load of ADM authoring work (I.e, from PF down). All that will need implementing for non-common-def DS audioobjects

firthm01 · 2023-12-12T17:45:34Z

Force push was for rebase (CI fixes on base branch)

Working towards removing the horrible hard-coded speaker setups and using indexes to refer to them

Just for consistency with what we will do for DS - we don't need a separate instance, just the singleton

WIP - will not compile at this stage

WIP - will not compile at this stage Uses a pack format ID between the DS plugin and the scene (similar to how HOA handles it)

WIP - will not compile at this stage

…out index WIP - will not compile at this stage

... instead of speaker layout obj WIP - will not compile at this stage

WIP - will not compile at this stage

WIP - will compile, but tests failing

ear-production-suite-plugins/lib/src/programme_store_adm_serializer.cpp

bug was type def "1" being used for both DS and HOA

Also avoids calling getPrevSpk/getNextSpk twice each on each call to processSpeaker

…ulate

firthm01 changed the base branch from main to fix257-monitoring-shared-inputs-main November 11, 2023 20:55

firthm01 self-assigned this Nov 13, 2023

firthm01 force-pushed the supplementary-definitions branch from b770c96 to 1f2d317 Compare December 12, 2023 15:53

firthm01 force-pushed the fix257-monitoring-shared-inputs-main branch from fc1905f to b38444b Compare December 12, 2023 17:43

firthm01 force-pushed the supplementary-definitions branch from d4235d2 to dcab293 Compare December 12, 2023 17:45

Base automatically changed from fix257-monitoring-shared-inputs-main to main December 14, 2023 11:34

firthm01 added 23 commits December 14, 2023 18:30

Simpler lookup for legacy DS index to PF ID

ff1c4d8

Working towards removing the horrible hard-coded speaker setups and using indexes to refer to them

Common Def helper pulls pos, labels and LFE

5f09d69

Simplify use of AdmCommonDefinitionHelper in HOA plugin

fae0484

Just for consistency with what we will do for DS - we don't need a separate instance, just the singleton

More helpful ID fields in CD helper

ae3e2dd

Remove hardcoded layouts: remove lists and helpers

6b7d6db

WIP - will not compile at this stage

Remove hardcoded layouts: DS->Scene metadata changes

c481759

WIP - will not compile at this stage Uses a pack format ID between the DS plugin and the scene (similar to how HOA handles it)

Remove hardcoded layouts: EARPluginSuite uses pack format ids

2e3bd75

WIP - will not compile at this stage

Remove hardcoded layouts: ProgrammeStoreAdmSerializer doesn't use lay…

c4bd8b8

…out index WIP - will not compile at this stage

Remove hardcoded layouts: Make DS UI use pack format ID

514b0f4

... instead of speaker layout obj WIP - will not compile at this stage

Remove hardcoded layouts: Mon UI uses pack format ID

c10a223

WIP - will not compile at this stage

Remove hardcoded layouts: Fix up Scene UI

7f9ecf4

WIP - will compile, but tests failing

Remove hardcoded layouts: Fix tests

4a64970

Remove hardcoded layouts: Check getPackFormatData has val before use

95e83e8

niceName for channel formats - use speakerLabels for DS

4d952eb

Other code to use new niceName prop

e09a35e

ChannelFormatData is a class

873cb6e

PackFormatData is a class

ff4b31d

Speaker labels map

8153184

Remove CF "niceName" and use specific label props

9311762

Constness in speaker label lookup table

02c831f

channelFormatNiceNames map can be a static const

f040fab

Fix silly compare length arg

2028eb7

Improve PackFormatData label generation

ad7383f

firthm01 commented Feb 6, 2024

View reviewed changes

ear-production-suite-plugins/lib/src/programme_store_adm_serializer.cpp Outdated Show resolved Hide resolved

firthm01 added 26 commits February 6, 2024 23:34

Apply ID gen optimisation in store serialiser and fix bug

b48078c

bug was type def "1" being used for both DS and HOA

stable_sort on speaker locations

0a97de3

Avoid passing raw ptrs around in SpeakerLabelPlacement

5a6f5ca

Also avoids calling getPrevSpk/getNextSpk twice each on each call to processSpeaker

Improve matchingSpeakers with std::equal

162adf9

Remove unreq includes and don't inline convertPackFormatToEpsMetadata

5b51e78

Avoid copies of shared_ptrs where unnecessary

0f3dc28

Ensure consistency of dropdown entry ordering

fb98063

Constness of methods in AdmPresetDefinitionsHelper

8d8a355

default ctor/dtor for AdmPresetDefinitionsHelper

3360df8

typeDefinitionDatas stored as vec rather than map

c85edcc

Use const for TypeDefinitionData

f7c8340

Constness of PackFormatData and ChannelFormatData

218a812

Constness of relatedChannelFormats/relatedPackFormats

5651c47

Improve CF equality code

9ff952e

Remove unnecessary line of code

6b14e36

Simplify use of optionals

204d005

Avoid unnecessary copy

4c09fa7

Move simple assignments to initialiser lists

1a27b3a

Guard against shorter than expected speaker urns

318e265

Consolidate ITU URN parsing code

4c144b0

Tidy setupPresetDefinitionObject before further work

32a7207

getDocumentAudioPackFormat func to break up setupPresetDefinitionObject

76ce3fb

getElementRelationships shouldn't need to be called separately to pop…

d0f81e5

…ulate

Simplify matching of channel formats in a pack format

6937ccc

Shouldn't std::move a const

856dc72

Enforce use of AdmPresetDefinitionsHelper as singleton using reference

e7d6caa

firthm01 mentioned this pull request Feb 26, 2024

V1.1 feature branches combined #271

Closed

firthm01 merged commit 5567fd2 into main Feb 29, 2024
6 checks passed

firthm01 deleted the supplementary-definitions branch February 29, 2024 14:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improve ADM import support from 3rd party tools #259

Improve ADM import support from 3rd party tools #259

firthm01 commented Nov 11, 2023

firthm01 commented Dec 12, 2023 •

edited

Loading

Improve ADM import support from 3rd party tools #259

Improve ADM import support from 3rd party tools #259

Conversation

firthm01 commented Nov 11, 2023

firthm01 commented Dec 12, 2023 • edited Loading

firthm01 commented Dec 12, 2023 •

edited

Loading