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

Merge branch 'revert-0e66ace5' into 'main'

Revert "Merge branch 'ci/prepare_jbm_neutral_delay_test_for_basop' into 'main'"

See merge request !1816
parents 0e66ace5 beb4239c
Loading
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ DTX_OFF = "DTX_OFF"
# TODO: Clarify if this should also be tested with DTX, see #1122
TESTCASES = [
    # stereo
    ["stereo", 32000, "STEREO", "DTX_OFF"],
    ["stereo", 32000, "EXT", "DTX_OFF"],
    ["stereo", 48000, "MONO", "DTX_OFF"],
    ["stereo", 16400, "5_1", "DTX_OFF"],
    ["stereo", 256000, "7_1_4", "DTX_OFF"],
@@ -42,21 +42,21 @@ TESTCASES = [
    # McMasa
    ["MC_5_1", 16400, "BINAURAL_ROOM_IR", "DTX_OFF"],
    ["MC_7_1_4", 80000, "mono", "DTX_OFF"],
    ["MC_5_1_2", 24400, "5_1_2", "DTX_OFF"],
    ["MC_5_1_2", 24400, "EXT", "DTX_OFF"],
    # paramMC
    ["MC_5_1_2", 48000, "BINAURAL", "DTX_OFF"],
    ["MC_7_1", 80000, "7_1", "DTX_OFF"],
    ["MC_7_1", 80000, "EXT", "DTX_OFF"],
    ["MC_7_1_4", 128000, "FOA", "DTX_OFF"],
    # paramUpmix
    ["MC_7_1_4", 160000, "stereo", "DTX_OFF"],
    # discrete MC
    ["MC_5_1_2", 512000, "BINAURAL_ROOM_REVERB", "DTX_OFF"],
    ["MC_7_1", 128000, "7_1", "DTX_OFF"],
    ["MC_7_1", 128000, "EXT", "DTX_OFF"],
    ["MC_7_1_4", 256000, "5_1", "DTX_OFF"],
    # SBA
    ["HOA3", 64000, "BINAURAL", "DTX_OFF"],
    ["FOA", 256000, "BINAURAL_ROOM_REVERB", "DTX_OFF"],
    ["HOA2", 80000, "HOA2", "DTX_OFF"],
    ["HOA2", 80000, "EXT", "DTX_OFF"],
    ["HOA3", 512000, "5_1_4", "DTX_OFF"],
    ["FOA", 80000, "stereo", "DTX_OFF"],
    # OMASA
@@ -64,11 +64,11 @@ TESTCASES = [
    ["OMASA_ISM2", 24400, "MONO", "DTX_OFF"],
    ["OMASA_ISM3", 80000, "7_1_4", "DTX_OFF"],
    ["OMASA_ISM4", 64000, "HOA3", "DTX_OFF"],
    # ["OMASA_ISM2", 32000, "EXT", "DTX_OFF"],
    ["OMASA_ISM2", 32000, "EXT", "DTX_OFF"],
    # OSBA
    ["OSBA_ISM2_HOA2", 64000, "BINAURAL_ROOM_IR", "DTX_OFF"],
    # ["OSBA_ISM4_FOA", 512000, "BINAURAL_ROOM_REVERB", "DTX_OFF"],
    # ["OSBA_ISM3_HOA3", 128000, "EXT", "DTX_OFF"],
    ["OSBA_ISM4_FOA", 512000, "BINAURAL_ROOM_REVERB", "DTX_OFF"],
    ["OSBA_ISM3_HOA3", 128000, "EXT", "DTX_OFF"],
    ["OSBA_ISM2_HOA3", 96000, "5_1", "DTX_OFF"],
    ["OSBA_ISM1_HOA2", 32000, "mono", "DTX_OFF"],
]