Commit 84940d94 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge remote-tracking branch 'origin/main' into 1352-harmonize-output-scaling-in-combined-formats

parents 1b9816b0 13e8a3ac

.gitlab-ci.yml

+3 −0
Original line number Diff line number Diff line
@@ -1251,6 +1251,7 @@ ivas-conformance: 
    - cp -force IVAS_cod.exe IVAS_cod_ref.exe

    - cp -force IVAS_dec.exe IVAS_dec_ref.exe

    - cp -force IVAS_rend.exe IVAS_rend_ref.exe 

    - cp -force ISAR_post_rend.exe ISAR_post_rend_ref.exe

    

    # Reference creation

    - python scripts/prepare_combined_format_inputs.py
@@ -1316,6 +1317,7 @@ ivas-conformance: 
    expire_in: 1 week

    when: always

    paths:

      - report_cmd.html

      - report-junit.xml

      - report.html

      - Readme_IVAS_dec.txt
@@ -1344,6 +1346,7 @@ ivas-conformance-linux: 
    - cp IVAS_cod IVAS_cod_ref

    - cp IVAS_dec IVAS_dec_ref

    - cp IVAS_rend IVAS_rend_ref

    - cp ISAR_post_rend ISAR_post_rend_ref

    

    # Reference creation

    - python3 scripts/prepare_combined_format_inputs.py

tests/split_rendering/utils.py

+13 −9
Original line number Diff line number Diff line
@@ -191,15 +191,17 @@ def run_full_chain_split_rendering( 
    with TemporaryDirectory() as tmp_dir:

        tmp_dir = Path(tmp_dir)

        cut_in_file = tmp_dir.joinpath("cut_input.wav")

        # ivas_bitstream = tmp_dir.joinpath("ivas.192")

        ivas_bitstream_stem = f"{in_fmt}_{bitrate}bps_{renderer_fmt}_split_full_config_{render_config.stem}_prerfr_{pre_rend_fr}_postrfr_{post_rend_fr}_ivas.192"

        # split_bitstream = tmp_dir.joinpath("split.bit")

        split_bitstream_stem = f"{in_fmt}_{bitrate}bps_{renderer_fmt}_split_full_config_{render_config.stem}_prerfr_{pre_rend_fr}_postrfr_{post_rend_fr}_split.bit"



        renderer_fmt_for_filename = renderer_fmt.replace("BINAURAL_", "")

        filename_base = f"{in_fmt}_{bitrate}_{renderer_fmt_for_filename}_full_cfg_{render_config.stem}_fr_pre_{pre_rend_fr}_post_{post_rend_fr}"



        ivas_bitstream_stem = f"{filename_base}.192"

        # NOTE: the split bitstream files need to have ".bit" extension otherwise the conformance test breaks

        split_bitstream_stem = f"{filename_base}.splt.bit"

        if renderer_fmt == "BINAURAL_SPLIT_PCM":

            # split_md_file = tmp_dir.joinpath("split_md.bin")

            split_md_file_stem = f"{in_fmt}_{bitrate}bps_{renderer_fmt}_split_full_config_{render_config.stem}_prerfr_{pre_rend_fr}_postrfr_{post_rend_fr}_split_md.bit"

            split_md_file_stem = f"{filename_base}.spltmd.bit"



        out_file_stem = f"{in_fmt}_{bitrate}bps_{renderer_fmt}_split_full_config_{render_config.stem}_prerfr_{pre_rend_fr}_postrfr_{post_rend_fr}_.wav"

        out_file_stem = f"{filename_base}.wav"



        if test_info.config.option.create_ref:

            output_path_base = OUTPUT_PATH_REF
@@ -365,7 +367,9 @@ def run_external_split_rendering( 
        split_bitstream = tmp_dir.joinpath("split.bit")

        if renderer_fmt == "BINAURAL_SPLIT_PCM":

            split_md_file = tmp_dir.joinpath("split_md.bin")

        out_file_stem = f"{in_fmt}_{renderer_fmt}_split_ext_config_{render_config.stem}_postrfr_{pre_rend_fr}_prerfr_{post_rend_fr}.wav"



        renderer_fmt_for_filename = renderer_fmt.replace("BINAURAL_", "")

        out_file_stem = f"{in_fmt}_{renderer_fmt_for_filename}_ext_cfg_{render_config.stem}_fr_pre_{pre_rend_fr}_post_{post_rend_fr}.wav"



        if test_info.config.option.create_ref:

            output_path_base = OUTPUT_PATH_REF
@@ -450,7 +454,7 @@ def run_external_split_rendering( 


        cut, cut_fs = readfile(out_file)



        if get_mld == False:

        if not get_mld:

            [diff_found, snr, gain_b, max_diff] = check_BE(

                test_info, ref, ref_fs, cut, cut_fs

            )