Commit 5e50eca5 authored by Jan Kiene's avatar Jan Kiene
Browse files

revert basop-specific changes to JBM BE test

parent 0010135e

tests/test_be_for_jbm_neutral_dly_profile.py

+9 −16
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ DTX_OFF = "DTX_OFF" 
# testcases where DTX is supported

TESTCASES_WITH_DTX = [

    # stereo

    ["stereo", 32000, "STEREO"],

    ["stereo", 32000, "EXT"],

    ["stereo", 48000, "MONO"],

    ["stereo", 16400, "5_1"],

    ["stereo", 256000, "7_1_4"],
@@ -40,9 +40,8 @@ TESTCASES_WITH_DTX = [ 
    ["MASA1TC", 128000, "EXT"],

    # SBA

    ["HOA3", 64000, "BINAURAL"],

    ["HOA2", 80000, "HOA2"],

    # NOTE: commented because still some bug in BASOP float reference

    # ["FOA", 13200, "stereo"],

    ["HOA2", 80000, "EXT"],

    ["FOA", 13200, "stereo"],

]



# testcases with no DTX support
@@ -54,30 +53,27 @@ TESTCASES_NO_DTX = [ 
    # McMasa

    ["MC_5_1", 16400, "BINAURAL_ROOM_IR"],

    ["MC_7_1_4", 80000, "mono"],

    ["MC_5_1_2", 24400, "5_1_2"],

    ["MC_5_1_2", 24400, "EXT"],

    # paramMC

    ["MC_5_1_2", 48000, "BINAURAL"],

    ["MC_7_1", 80000, "7_1"],

    ["MC_7_1", 80000, "EXT"],

    ["MC_7_1_4", 128000, "FOA"],

    # paramUpmix

    ["MC_7_1_4", 160000, "stereo"],

    # discrete MC

    ["MC_5_1_2", 512000, "BINAURAL_ROOM_REVERB"],

    ["MC_7_1", 128000, "7_1"],

    ["MC_7_1", 128000, "EXT"],

    ["MC_7_1_4", 256000, "5_1"],

    # OMASA

    ["OMASA_ISM1", 512000, "BINAURAL"],

    ["OMASA_ISM2", 24400, "MONO"],

    ["OMASA_ISM3", 80000, "7_1_4"],

    ["OMASA_ISM4", 64000, "HOA3"],

    # NOTE: commented because EXT unsupported currently

    # ["OMASA_ISM2", 32000, "EXT"],

    ["OMASA_ISM2", 32000, "EXT"],

    # OSBA

    ["OSBA_ISM2_HOA2", 64000, "BINAURAL_ROOM_IR"],

    # NOTE: commented because still some bug in BASOP float reference

    # ["OSBA_ISM4_FOA", 512000, "BINAURAL_ROOM_REVERB"],

    # NOTE: commented because EXT unsupported currently

    # ["OSBA_ISM3_HOA3", 128000, "EXT"],

    ["OSBA_ISM4_FOA", 512000, "BINAURAL_ROOM_REVERB"],

    ["OSBA_ISM3_HOA3", 128000, "EXT"],

    ["OSBA_ISM2_HOA3", 96000, "5_1"],

    ["OSBA_ISM1_HOA2", 32000, "mono"],

]
@@ -185,9 +181,6 @@ def test_be_for_jbm_neutral_dly_profile_no_dtx( 
    )





@pytest.mark.skip(

    reason="non-BE bug for DTX cases not yet fixed in BASOP ivas-float-update"

)

@pytest.mark.parametrize("in_format,bitrate,out_format", TESTCASES_WITH_DTX)

def test_be_for_jbm_neutral_dly_profile_with_dtx(

    in_format,