Commit e9cdcc92 authored by Jan Kiene's avatar Jan Kiene
Browse files

test different kinds of ISM MD with combined modes

parent 34efa8aa

tests/codec_be_to_accepted_release/constants.py

+2 −2
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ OSBA_PARAMS = list( 
        ],  # TODO: enable planar once clarified

        BITRATES_ALL,

        SAMPLING_RATES_ALL,

        [ISM_MD_BASIC],

        [ISM_MD_BASIC, ISM_MD_NULL, ISM_MD_EXTENDED],

    )

)

OMASA_PARAMS = list(
@@ -366,7 +366,7 @@ OMASA_PARAMS = list( 
        INPUT_FORMATS_MASA,

        BITRATES_ALL,

        SAMPLING_RATES_ALL,

        [ISM_MD_BASIC],

        [ISM_MD_BASIC, ISM_MD_NULL, ISM_MD_EXTENDED],

    )

)

COMBINED_FORMATS_PARAMS = OSBA_PARAMS + OMASA_PARAMS

tests/codec_be_to_accepted_release/test_decoder.py

+8 −2
Original line number Diff line number Diff line
@@ -242,12 +242,18 @@ def test_decoder_combined_formats( 
        f"{input_format_combined}_{input_format_ism}_{input_format_other}",

        input_sampling_rate,

    ).stem 

    suffix = "_basic_MD"

    if md_type == ISM_MD_EXTENDED:

        suffix = "_ext_MD"

    elif md_type == ISM_MD_NULL:

        suffix = "_null_MD"

    with get_bitstream(

        testv_name,

        input_format_combined,

        bitrate,

        input_sampling_rate,

        DTX_OFF,

        suffix=suffix,

        processing=bitstream_processing,

    ) as ref_bitstream:

        dut_output = get_output_path(ref_bitstream, output_format, output_sampling_rate)

tests/codec_be_to_accepted_release/test_encoder.py

+6 −1
Original line number Diff line number Diff line
@@ -236,8 +236,13 @@ def test_encoder_combined_formats( 
        + options_ism[2:]

        + options_other[2:]

    )

    suffix = "_basic_MD"

    if md_type == ISM_MD_EXTENDED:

        suffix = "_ext_MD"

    elif md_type == ISM_MD_NULL:

        suffix = "_null_MD"

    bitstream = get_bitstream_path(

        DUT_PATH, testv.stem, input_format_combined, bitrate, sampling_rate, DTX_OFF

        DUT_PATH, testv.stem, input_format_combined, bitrate, sampling_rate, DTX_OFF, suffix=suffix

    )

    run_check(

        bitstream,