Commit cef33622 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

- support IVAS transcoding and full chain split rendering 

- update test configs
- placeholder functionality for external (IVAS_rend only) split rendering
- fix trajectory handling in processing
- resolve some TODOs
parent a6aa5cb6

.gitignore

+17 −16
Original line number Diff line number Diff line
@@ -12,22 +12,23 @@ venv/ 
*.bs

*.192

mc.double

experiments/selection/*/proc_input*/cat*/*.wav

experiments/selection/*/proc_input*/cat*/*.csv

experiments/selection/*/proc_input*/cat*/*.pcm

experiments/selection/*/proc_input*/FOA*/*.wav

experiments/selection/*/proc_input*/HOA2*/*.wav

experiments/selection/*/background_noise/*.wav

experiments/selection/*/background_noise/*.txt

experiments/selection/*/proc_input*/*.wav

experiments/selection/*/proc_input*/*.pcm

experiments/selection/*/proc_input*/*.csv

experiments/selection/*/proc_input*/*.log

experiments/selection/*/proc_input*/*.yml

experiments/selection/*/proc_output*/

experiments/selection/*/config/*-lab_*.yml

experiments/selection/*/gen_input/IRs/*.wav

experiments/selection/*/gen_input/items_mono/*.wav

experiments/selection*/*/proc_input*/cat*/*.wav

experiments/selection*/*/proc_input*/cat*/*.csv

experiments/selection*/*/proc_input*/cat*/*.pcm

experiments/selection*/*/proc_input*/FOA*/*.wav

experiments/selection*/*/proc_input*/HOA2*/*.wav

experiments/selection*/*/background_noise/*.wav

experiments/selection*/*/background_noise/*.txt

experiments/selection*/*/proc_input*/*.wav

experiments/selection*/*/proc_input*/*.pcm

experiments/selection*/*/proc_input*/*.csv

experiments/selection*/*/proc_input*/*.log

experiments/selection*/*/proc_input*/*.yml

experiments/selection*/*/proc_output*/

experiments/selection*/*/config/*-lab_*.yml

experiments/selection*/*/config/*.csv

experiments/selection*/*/gen_input/IRs/*.wav

experiments/selection*/*/gen_input/items_mono/*.wav

*~

tests/temp_output_*

tests/cut

README.md

+1 −1
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ postprocessing: 
    ### Flag whether output should be limited to avoid clipping (can alter target loudness); default = true

    # limit: false

    ### Head-tracking trajectory file for binaural output; default = null

    # trajectory: "path/to/file"

    # out_trajectory: "path/to/file"

```



</details>

examples/TEMPLATE.yml

+1 −1
Original line number Diff line number Diff line
@@ -329,4 +329,4 @@ postprocessing: 
    ### Flag whether output should be limited to avoid clipping (can alter target loudness); default = false

    # limit: true

    ### Head-tracking trajectory file for binaural output; default = null

    # trajectory: "path/to/file"
 
    # out_trajectory: "path/to/file"

experiments/selection_isar/BS1534-1a/config/BS1534-1a.yml

+14 −33
Original line number Diff line number Diff line
@@ -37,15 +37,10 @@ preprocessing_2: 
    preamble_noise: false

    repeat_signal: true



#################################################

### Bitstream processing

#################################################



################################################

### Configuration for conditions under test

################################################

conditions_to_generate:



    ### Reference and anchor conditions ##########################

    c01:

        type: ref
@@ -60,46 +55,33 @@ conditions_to_generate: 
        cod:

        dec:

            fmt: "BINAURAL"

            trajectory: null # TODO

            trajectory: "/Users/tmu/git/ivas-processing-scripts/experiments/selection_isar/BS1534-1a/config/pre.csv"

    c04:

        type: ivas

        bitrates:

            - 512000

        cod:

        dec:

            fmt: "BINAURAL"

            trajectory: null # TODO

    c05:

        type: ivas_transcoding

        bitrates:

            - 512000

        cod:

        dec:

            fmt: "BINAURAL"

            trajectory: null # TODO

        #TODO

        post_cod:

            trajectory: "/Users/tmu/git/ivas-processing-scripts/experiments/selection_isar/BS1534-1a/config/pre.csv"

        trans_bitrate: 256000

        trans_cod:

            fmt: "STEREO"

        post_dec:

        trans_dec:

            fmt: "STEREO"

    c06:

        type: ivas_split

    c05:

        type: ivas_split_rend_full

        bitrates:

            - 512000 # TODO

            - 512000

        cod:

        dec:

            fmt: "BINAURAL_SPLIT_CODED"

        splitrend:

            trajectory: "/Users/tmu/git/ivas-processing-scripts/experiments/selection_isar/BS1534-1a/config/pre.csv"

        split_rend:

            fmt: "BINAURAL"

            trajectory: null # TODO

    # c07:

    #     type: ivas_split_2

    #     bitrates:

    #         - 512000 # TODO

    #     cod:

    #     dec:

    #         fmt: "STEREO"



            bitrate: 512000

            dof: 3

            trajectory: "/Users/tmu/git/ivas-processing-scripts/experiments/selection_isar/BS1534-1a/config/post.csv"



################################################

### Post-processing
@@ -108,5 +90,4 @@ postprocessing: 
    fmt: "BINAURAL"

    fs: 48000

    loudness: -26

    trajectory: null

    out_trajectory: "/Users/tmu/git/ivas-processing-scripts/experiments/selection_isar/BS1534-1a/config/post.csv"

experiments/selection_isar/BS1534-2a/config/BS1534-2a.yml

+21 −35
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ condition_in_output_filename: true 
### Input configuration

################################################

input:

    fmt: "MASA"

    fmt: "FOA"

    fs: 48000

    aligned_to:

        len: 20
@@ -37,20 +37,17 @@ preprocessing_2: 
    preamble_noise: false

    repeat_signal: true



#################################################

### Bitstream processing

#################################################



################################################

### Configuration for conditions under test

################################################

conditions_to_generate:



    ### Reference and anchor conditions ##########################

    c01:

        type: ref

        fmt: "MASA2DIR1"

    c02:

        type: lp7k

        fmt: "MASA2DIR1"



    ### IVAS condition ###############################

    c03:
@@ -58,48 +55,38 @@ conditions_to_generate: 
        bitrates:

            - 512000

        cod:

            fmt: "MASA2DIR1"

        dec:

            fmt: "BINAURAL"

            trajectory: null # TODO

            trajectory: "/Users/tmu/git/ivas-processing-scripts/experiments/selection_isar/BS1534-2a/config/pre.csv"

    c04:

        type: ivas

        bitrates:

            - 512000

        cod:

        dec:

            fmt: "BINAURAL"

            trajectory: null # TODO

    c05:

        type: ivas_transcoding

        bitrates:

            - 512000

        cod:

            fmt: "MASA2DIR1"

        dec:

            fmt: "BINAURAL"

            trajectory: null # TODO

        #TODO

        post_cod:

            trajectory: "/Users/tmu/git/ivas-processing-scripts/experiments/selection_isar/BS1534-2a/config/pre.csv"

        trans_bitrate: 256000

        trans_cod:

            fmt: "STEREO"

        post_dec:

        trans_dec:

            fmt: "STEREO"

    c06:

        type: ivas_split

    c05:

        type: ivas_split_rend_full

        bitrates:

            - 512000 # TODO

            - 512000

        cod:

            fmt: "MASA2DIR1"

        dec:

            fmt: "BINAURAL_SPLIT_CODED"

        splitrend:

            trajectory: "/Users/tmu/git/ivas-processing-scripts/experiments/selection_isar/BS1534-2a/config/pre.csv"

        split_rend:

            fmt: "BINAURAL"

            trajectory: null # TODO

    # c07:

    #     type: ivas_split_2

    #     bitrates:

    #         - 512000 # TODO

    #     cod:

    #     dec:

    #         fmt: "STEREO"



            bitrate: 512000

            dof: 3

            trajectory: "/Users/tmu/git/ivas-processing-scripts/experiments/selection_isar/BS1534-2a/config/post.csv"



################################################

### Post-processing
@@ -108,5 +95,4 @@ postprocessing: 
    fmt:  "BINAURAL"

    fs: 48000

    loudness: -26

    trajectory: null

    out_trajectory: "/Users/tmu/git/ivas-processing-scripts/experiments/selection_isar/BS1534-2a/config/post.csv"