Commit ddea277e authored by norvell's avatar norvell
Browse files

Fix syntax error and small cleanup

parent ffeff9e2

tests/codec_be_on_mr_nonselection/test_param_file.py

+35 −34
Original line number Diff line number Diff line
@@ -433,42 +433,12 @@ def test_param_file_tests( 
        decoder_only,

    )



    # Reconstruct output file names for comparison

    if update_ref in [0, 2]:



        # Output file names for comparison

        dut_output_file = f"{dut_base_path}/param_file/dec/{output_file}"

        ref_output_file = f"{reference_path}/param_file/dec/{output_file}"



    # Check if we need to render to stereo or binaural for PEAQ comparison

    if peaq_binaural:



        # Disable tracefile supported comparison -- no tracefile available for input

        tracefile_dec = ""



        # Find input format

        in_fmt = [

            (a, b)

            for (a, b) in INPUT_FMT

            if re.search(a, enc_opts)

        ][0][1]



        record_property = dut_decoder_frontend.record_property if dut_decoder_frontend else ref_decoder_frontend.record_property



        (ref_output_file, dut_output_file) = rend.binauralize_input_and_output(

                record_property,

                props_to_record,

                test_info,

                testv_file,

                dut_output_file,

                ref_output_file,

                in_fmt,

                output_config,

                enc_opts,

                dec_opts,

                in_sr,

                out_sr,

        )



    if update_ref in [0, 2]:



        # set to false per default even if this is no JBM case - makes later check for failure easier

        tracefile_last_rtp_numbers_differ = False
@@ -501,6 +471,37 @@ def test_param_file_tests( 
        else:

            ref_file = ref_output_file



        # Check if we need to render to stereo or binaural for PEAQ comparison

        if peaq_binaural:



            allow_differing_lengths = True

            # Disable tracefile supported comparison -- no tracefile available for input

            tracefile_dec = ""



            # Find input format

            in_fmt = [

                (a, b)

                for (a, b) in INPUT_FMT

                if re.search(a, enc_opts)

            ][0][1]



            record_property = dut_decoder_frontend.record_property if dut_decoder_frontend else ref_decoder_frontend.record_property



            (ref_file, dut_output_file) = rend.binauralize_input_and_output(

                    record_property,

                    props_to_record,

                    test_info,

                    testv_file,

                    dut_output_file,

                    ref_output_file,

                    in_fmt,

                    output_config,

                    enc_opts,

                    dec_opts,

                    in_sr,

                    out_sr,

            )



        fs = int(sampling_rate) * 1000

        output_differs, reason = cmp_pcm(

            ref_file,

tests/codec_be_on_mr_nonselection/test_sba.py

+7 −7
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ def test_pca_enc( 
    else:

        assert 0



    input_config = SBA_FORMAT(abs(int(sba_order)))

    input_config = SBA_FORMAT[abs(int(sba_order))]



    if not decoder_only:

        sba_enc(
@@ -281,7 +281,7 @@ def test_sba_enc_system( 
    else:

        cut_gain = "1.0"



    input_config = SBA_FORMAT(abs(int(sba_order)))

    input_config = SBA_FORMAT[abs(int(sba_order))]



    if not decoder_only:

        ref_stats_file, dut_stats_file = sba_enc(
@@ -423,7 +423,7 @@ def test_spar_hoa2_enc_system( 
    else:

        assert 0



    input_config = SBA_FORMAT(abs(int(sba_order)))

    input_config = SBA_FORMAT[abs(int(sba_order))]



    if not decoder_only:

        ref_stats_file, dut_stats_file = sba_enc(
@@ -565,7 +565,7 @@ def test_spar_hoa3_enc_system( 
    else:

        assert 0



    input_config = SBA_FORMAT(abs(int(sba_order)))

    input_config = SBA_FORMAT[abs(int(sba_order))]



    if not decoder_only:

        ref_stats_file, dut_stats_file = sba_enc(
@@ -715,7 +715,7 @@ def test_sba_enc_BWforce_system( 
    else:

        assert 0



    input_config = SBA_FORMAT(abs(int(sba_order)))

    input_config = SBA_FORMAT[abs(int(sba_order))]



    if not decoder_only:

        ref_stats_file, dut_stats_file = sba_enc(
@@ -887,7 +887,7 @@ def test_sba_plc_system( 
    else:

        cut_gain = "1.0"



    input_config = SBA_FORMAT(abs(int(sba_order)))

    input_config = SBA_FORMAT[abs(int(sba_order))]



    if not decoder_only:

        sba_enc(
@@ -1182,7 +1182,7 @@ def sba_dec( 




        if peaq_binaural:



            allow_differing_lengths = True

            enc_opts = ""

            dec_opts = ""

            if gain_flag != -1: