Commit 6bdf6cb4 authored by Jan Brouwer's avatar Jan Brouwer
Browse files

Merge branch 'philips/contribution-38-control-metadata-reverb-draft' of... 

Merge branch 'philips/contribution-38-control-metadata-reverb-draft' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into philips/contribution-38-control-metadata-reverb-draft
parents fae99361 c47ee62f

scripts/reverb/text_to_binary_payload.py

+59 −58
Original line number Diff line number Diff line
@@ -86,16 +86,17 @@ def parse_reverb_text_configuration_and_generate_binary_payload(file): 
            sections[section_name] = config[section_name]



    # parse room acoustics

    if 'roomAcoustics' in sections:

    hasAcEnv = len(sections['roomAcoustics']) > 0

    data = bitarray(get_bool_code(hasAcEnv))                                            # hasAcEnv (see IVAS acoustic environment payload syntax document)

    if hasAcEnv:

        frequencyGridCount = eval_option(sections['roomAcoustics']['frequencyGridCount'])

        acousticEnvironmentCount = eval_option(sections['roomAcoustics']['acousticEnvironmentCount'])

        assert frequencyGridCount == len(sections['frequencyGrid'])

        assert acousticEnvironmentCount == len(sections['acousticEnvironment'])



        # parse frequency grids

    data = bitarray(

          '1'                                                                       # hasAcEnv (see IVAS acoustic environment payload syntax document)

        + get_count_or_index_code(len(sections['frequencyGrid'])),                  # fgdNrGrids

        data += bitarray(

            get_count_or_index_code(len(sections['frequencyGrid'])),                    # fgdNrGrids

            endian='big')

        for _, fg in sections['frequencyGrid'].items():

            method = eval_option(fg['method'])
@@ -153,7 +154,7 @@ def parse_reverb_text_configuration_and_generate_binary_payload(file): 


    # parse directivity

    hasDirectivity = len(sections['directivity']) > 0

    data += get_bool_code(hasDirectivity)                                                                      # hasDirectivity

    data += bitarray(get_bool_code(hasDirectivity))                                     # hasDirectivity

    if hasDirectivity:

        dir_values = eval_option(sections['directivity']['directivity'])

        data += bitarray(get_angle_code(dir_values[0])                                  # Directivity inner angle

tests/codec_be_on_mr_selection/__init__.py

+3 −2
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ def run_check( 
        add_option_list=options + [str(f) for f in metadata],

    )



    if not is_ref_creation:

        if not is_be_to_ref(dut_bitstream):

            pytest.fail(f"Bitstream file differs from reference")