Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve ADM import support from 3rd party tools #259

Merged
merged 99 commits into from
Feb 29, 2024
Merged

Improve ADM import support from 3rd party tools #259

merged 99 commits into from
Feb 29, 2024

Commits on Dec 14, 2023

  1. Simpler lookup for legacy DS index to PF ID 

    Working towards removing the horrible hard-coded speaker setups and using indexes to refer to them
    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    ff1c4d8 View commit details
    Browse the repository at this point in the history

  2. Common Def helper pulls pos, labels and LFE

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    5f09d69 View commit details
    Browse the repository at this point in the history

  3. Simplify use of AdmCommonDefinitionHelper in HOA plugin 

    Just for consistency with what we will do for DS - we don't need a separate instance, just the singleton
    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    fae0484 View commit details
    Browse the repository at this point in the history

  4. More helpful ID fields in CD helper

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    ae3e2dd View commit details
    Browse the repository at this point in the history

  5. Remove hardcoded layouts: remove lists and helpers 

    WIP - will not compile at this stage
    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    6b7d6db View commit details
    Browse the repository at this point in the history

  6. Remove hardcoded layouts: DS->Scene metadata changes 

    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)
    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    c481759 View commit details
    Browse the repository at this point in the history

  7. Remove hardcoded layouts: EARPluginSuite uses pack format ids 

    WIP - will not compile at this stage
    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    2e3bd75 View commit details
    Browse the repository at this point in the history

  8. Remove hardcoded layouts: ProgrammeStoreAdmSerializer doesn't use lay… 

    …out index

WIP - will not compile at this stage
    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    c4bd8b8 View commit details
    Browse the repository at this point in the history

  9. Remove hardcoded layouts: Make DS UI use pack format ID 

    ... instead of speaker layout obj

WIP - will not compile at this stage
    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    514b0f4 View commit details
    Browse the repository at this point in the history

  10. Remove hardcoded layouts: Mon UI uses pack format ID 

    WIP - will not compile at this stage
    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    c10a223 View commit details
    Browse the repository at this point in the history

  11. Remove hardcoded layouts: Fix up Scene UI 

    WIP - will compile, but tests failing
    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    7f9ecf4 View commit details
    Browse the repository at this point in the history

  12. Remove hardcoded layouts: Fix tests

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    4a64970 View commit details
    Browse the repository at this point in the history

  13. Remove hardcoded layouts: Check getPackFormatData has val before use

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    95e83e8 View commit details
    Browse the repository at this point in the history

  14. niceName for channel formats - use speakerLabels for DS

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    4d952eb View commit details
    Browse the repository at this point in the history

  15. Other code to use new niceName prop

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    e09a35e View commit details
    Browse the repository at this point in the history

  16. ChannelFormatData is a class

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    873cb6e View commit details
    Browse the repository at this point in the history

  17. PackFormatData is a class

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    ff4b31d View commit details
    Browse the repository at this point in the history

  18. Speaker labels map

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    8153184 View commit details
    Browse the repository at this point in the history

  19. Remove CF "niceName" and use specific label props

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    9311762 View commit details
    Browse the repository at this point in the history

  20. Constness in speaker label lookup table

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    02c831f View commit details
    Browse the repository at this point in the history

  21. channelFormatNiceNames map can be a static const

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    f040fab View commit details
    Browse the repository at this point in the history

  22. Fix silly compare length arg

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    2028eb7 View commit details
    Browse the repository at this point in the history

  23. Improve PackFormatData label generation

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    ad7383f View commit details
    Browse the repository at this point in the history

  24. rn AdmCommonDefinitionHelper to AdmPresetDefinitionsHelper

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    3cf3a4c View commit details
    Browse the repository at this point in the history

  25. DS labels: Tidy existing positioning code

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    44a7ce5 View commit details
    Browse the repository at this point in the history

  26. DS labels: nice label radius calc

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    9f86dac View commit details
    Browse the repository at this point in the history

  27. DS labels: Basic alg for inner/outer spk label placement

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    bed5737 View commit details
    Browse the repository at this point in the history

  28. DS labels: Nudge labels to make clear which spk

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    1eb4d41 View commit details
    Browse the repository at this point in the history

  29. DS labels: Prefer nudging inners over outers

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    582f0d1 View commit details
    Browse the repository at this point in the history

  30. DS labels: Make more space for speaker layers

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    14bc33b View commit details
    Browse the repository at this point in the history

  31. DS labels: Split speaker_layer into header and source 

    Prep for tidying label placement alg
    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    75b6dbe View commit details
    Browse the repository at this point in the history

  32. DS labels: move alg code into SpeakerLabelPlacement class

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    c174147 View commit details
    Browse the repository at this point in the history

  33. DS labels: consolidate copied bits of code

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    109df67 View commit details
    Browse the repository at this point in the history

  34. DS label: consistency in struct and called func args

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    4a4e7e4 View commit details
    Browse the repository at this point in the history

  35. DS label: consistency in struct and called func args - update header

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    c7c83a6 View commit details
    Browse the repository at this point in the history

  36. Pull in supplementary defs to helper

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    2732d3b View commit details
    Browse the repository at this point in the history

  37. Sort DS speaker layouts by channel count

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    04a7b66 View commit details
    Browse the repository at this point in the history

  38. isCommonDefinition funcs

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    2c88f25 View commit details
    Browse the repository at this point in the history

  39. Use AdmPresetDefinitionsHelper singleton in ProgrammeStoreAdmSerializer

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    2f60c63 View commit details
    Browse the repository at this point in the history

  40. Add missing definitions from supplements

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    474d968 View commit details
    Browse the repository at this point in the history

  41. AdmPresetDefinitionsHelper needs to be able to look up PFs by CFs 

    This is because some 3rd party software doesn't use consistent PF IDs for their custom definitions
    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    94bec42 View commit details
    Browse the repository at this point in the history

  42. Look up custom PFs during import by CFs

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    4a4d71e View commit details
    Browse the repository at this point in the history

  43. Improve speaker labeling. Support custom CFs.

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    7eb6cec View commit details
    Browse the repository at this point in the history

  44. mv cartesianspeakerlayouts.h/.cpp

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    19de175 View commit details
    Browse the repository at this point in the history

  45. PF Data lookup methods collected in AdmPresetDefinitionsHelper

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    8e94b36 View commit details
    Browse the repository at this point in the history

  46. Fix lvalue arg issue - MacOS builds

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    ae21379 View commit details
    Browse the repository at this point in the history

  47. Consolidate all the "isCommonDefinition" checks

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    e65bdb9 View commit details
    Browse the repository at this point in the history

  48. Only ever match supposed Common Def PFs by ID

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    7afabb0 View commit details
    Browse the repository at this point in the history

  49. FB360 import supports supplementary definitions for DS types

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    35008cd View commit details
    Browse the repository at this point in the history

  50. VISR import supports supplementary definitions for DS types

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    ae86645 View commit details
    Browse the repository at this point in the history

  51. Update AdmPresetDefinitionsHelper prop name in ADM Export Source VST

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    37f66b3 View commit details
    Browse the repository at this point in the history

  52. Simplify createTopLevelObject ATUID lookup

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    4b248ab View commit details
    Browse the repository at this point in the history

  53. copyMissingTreeElms method to copy supplementary defs

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    4233e64 View commit details
    Browse the repository at this point in the history

  54. ProgrammeStoreAdmSerializer supports supplementary definitions for DS

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    8b156f8 View commit details
    Browse the repository at this point in the history

  55. Simplify addPresetDefinitionObjectTo even more

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    cb11429 View commit details
    Browse the repository at this point in the history

  56. createTopLevelObject can shared logic between HOA and DS

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    2f72af0 View commit details
    Browse the repository at this point in the history

  57. Support preset defs in EAR export code 

     (not just com def)
    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    c8b0c8f View commit details
    Browse the repository at this point in the history

  58. Move addPresetDefinitionObjectTo to the helper class

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    0109a4e View commit details
    Browse the repository at this point in the history

  59. Improve comments in EarVstExportSources

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    8798a7b View commit details
    Browse the repository at this point in the history

  60. Break up addPresetDefinitionObjectTo into reusable code

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    6e26642 View commit details
    Browse the repository at this point in the history

  61. ObjectHolder audioPackFormat prop populated

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    e204f87 View commit details
    Browse the repository at this point in the history

  62. Support preset defs in ADM VST export code 

     (not just com def)
Includes BS.2076-2 structure support in CHNA generation
    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    402e1eb View commit details
    Browse the repository at this point in the history

  63. Objects in ADM VST use 2076-2 structures too

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    1a14347 View commit details
    Browse the repository at this point in the history

  64. Update libadm - reassignId fixes

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    1d9a66f View commit details
    Browse the repository at this point in the history

  65. Lookup CFs by props

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    4e01fbd View commit details
    Browse the repository at this point in the history

  66. Fix build

    @firthm01
    firthm01 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    aeacaba View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2023

  1. Fix crash when DS layout is unset 

    Uses same logic as HOA plugin to guard
    @firthm01
    firthm01 committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    12da035 View commit details
    Browse the repository at this point in the history

  2. Remove unused line in ADM Exp Src plugin

    @firthm01
    firthm01 committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    805655c View commit details
    Browse the repository at this point in the history

  3. Custom CFs must always be matched by properties 

    ...because they won't have consistent ID's, and we shouldn't just assume that just because we have a matching ID in the presets, it's definitely the right one - might be a coincidental ID collision
    @firthm01
    firthm01 committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    6547b1e View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2023

  1. Call reassignIds after generating doc in ProgrammeStoreAdmSerializer

    @firthm01
    firthm01 committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    a09c793 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2024

  1. List custom defs after common and in lighter font

    @firthm01
    firthm01 committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    3810fc9 View commit details
    Browse the repository at this point in the history

  2. Same light/bold font logic for HOA PFs 

    Doesn't actually make any difference at the mo as they're all common defs, but in case of future
    @firthm01
    firthm01 committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    8eba33e View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2024

  1. Neater, safer, faster ID generation

    @firthm01
    firthm01 committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    aec32eb View commit details
    Browse the repository at this point in the history

  2. Apply ID gen optimisation in store serialiser and fix bug 

    bug was type def "1" being used for both DS and HOA
    @firthm01
    firthm01 committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    b48078c View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. stable_sort on speaker locations

    @firthm01
    firthm01 committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    0a97de3 View commit details
    Browse the repository at this point in the history

  2. Avoid passing raw ptrs around in SpeakerLabelPlacement 

    Also avoids calling getPrevSpk/getNextSpk twice each on each call to processSpeaker
    @firthm01
    firthm01 committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    5a6f5ca View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2024

  1. Improve matchingSpeakers with std::equal

    @firthm01
    firthm01 committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    162adf9 View commit details
    Browse the repository at this point in the history

  2. Remove unreq includes and don't inline convertPackFormatToEpsMetadata

    @firthm01
    firthm01 committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    5b51e78 View commit details
    Browse the repository at this point in the history

  3. Avoid copies of shared_ptrs where unnecessary

    @firthm01
    firthm01 committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    0f3dc28 View commit details
    Browse the repository at this point in the history

  4. Ensure consistency of dropdown entry ordering

    @firthm01
    firthm01 committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    fb98063 View commit details
    Browse the repository at this point in the history

  5. Constness of methods in AdmPresetDefinitionsHelper

    @firthm01
    firthm01 committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    8d8a355 View commit details
    Browse the repository at this point in the history

  6. default ctor/dtor for AdmPresetDefinitionsHelper

    @firthm01
    firthm01 committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    3360df8 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2024

  1. typeDefinitionDatas stored as vec rather than map

    @firthm01
    firthm01 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    c85edcc View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. Use const for TypeDefinitionData

    @firthm01
    firthm01 committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    f7c8340 View commit details
    Browse the repository at this point in the history

  2. Constness of PackFormatData and ChannelFormatData

    @firthm01
    firthm01 committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    218a812 View commit details
    Browse the repository at this point in the history

  3. Constness of relatedChannelFormats/relatedPackFormats

    @firthm01
    firthm01 committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    5651c47 View commit details
    Browse the repository at this point in the history

  4. Improve CF equality code

    @firthm01
    firthm01 committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    9ff952e View commit details
    Browse the repository at this point in the history

  5. Remove unnecessary line of code

    @firthm01
    firthm01 committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    6b14e36 View commit details
    Browse the repository at this point in the history

  6. Simplify use of optionals

    @firthm01
    firthm01 committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    204d005 View commit details
    Browse the repository at this point in the history

  7. Avoid unnecessary copy

    @firthm01
    firthm01 committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    4c09fa7 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2024

  1. Move simple assignments to initialiser lists

    @firthm01
    firthm01 committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    1a27b3a View commit details
    Browse the repository at this point in the history

  2. Guard against shorter than expected speaker urns

    @firthm01
    firthm01 committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    318e265 View commit details
    Browse the repository at this point in the history

  3. Consolidate ITU URN parsing code

    @firthm01
    firthm01 committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    4c144b0 View commit details
    Browse the repository at this point in the history

  4. Tidy setupPresetDefinitionObject before further work

    @firthm01
    firthm01 committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    32a7207 View commit details
    Browse the repository at this point in the history

  5. getDocumentAudioPackFormat func to break up setupPresetDefinitionObject

    @firthm01
    firthm01 committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    76ce3fb View commit details
    Browse the repository at this point in the history

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

    …ulate
    @firthm01
    firthm01 committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    d0f81e5 View commit details
    Browse the repository at this point in the history

  7. Simplify matching of channel formats in a pack format

    @firthm01
    firthm01 committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    6937ccc View commit details
    Browse the repository at this point in the history

  8. Shouldn't std::move a const

    @firthm01
    firthm01 committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    856dc72 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. Enforce use of AdmPresetDefinitionsHelper as singleton using reference

    @firthm01
    firthm01 committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    e7d6caa View commit details
    Browse the repository at this point in the history