Loading tests/test_be_for_jbm_neutral_dly_profile.py +57 −13 Original line number Diff line number Diff line Loading @@ -15,24 +15,61 @@ DTX_OFF = "DTX_OFF" TESTCASES = [ # stereo ["stereo", 32000, "EXT", "DTX_OFF"], ["stereo", 48000, "7_1_4", "DTX_OFF"], ["ISM4", 48000, "BINAURAL", "DTX_OFF"], ["stereo", 48000, "MONO", "DTX_OFF"], ["stereo", 16400, "5_1", "DTX_OFF"], ["stereo", 256000, "7_1_4", "DTX_OFF"], # param ISM ["ISM4", 32000, "BINAURAL_ROOM_REVERB", "DTX_OFF"], ["ISM3", 24400, "STEREO", "DTX_OFF"], ["ISM4", 24400, "5_1_2", "DTX_OFF"], ["ISM3", 32000, "HOA2", "DTX_OFF"], # discrete ISM ["ISM3", 64000, "BINAURAL", "DTX_OFF"], ["MASA1TC", 24400, "BINAURAL", "DTX_OFF"], ["MASA2TC", 80000, "BINAURAL", "DTX_OFF"], ["MC_5_1", 128000, "BINAURAL", "DTX_OFF"], ["MC_5_1_4", 48000, "BINAURAL", "DTX_OFF"], ["MC_7_1", 96000, "BINAURAL", "DTX_OFF"], ["MC_7_1_4", 160000, "7_1_4", "DTX_OFF"], ["ISM1", 32000, "BINAURAL_ROOM_IR", "DTX_OFF"], ["ISM2", 96000, "7_1", "DTX_OFF"], ["ISM1", 80000, "MONO", "DTX_OFF"], ["ISM4", 128000, "FOA", "DTX_OFF"], # MASA ["MASA1TC", 24400, "BINAURAL_ROOM_IR", "DTX_OFF"], ["MASA2TC", 80000, "stereo", "DTX_OFF"], ["MASA1TC", 16400, "7_1_4", "DTX_OFF"], ["MASA2TC", 256000, "HOA3", "DTX_OFF"], ["MASA1TC", 128000, "EXT", "DTX_OFF"], # MC # McMasa ["MC_5_1", 16400, "BINAURAL_ROOM_IR", "DTX_OFF"], ["MC_7_1_4", 80000, "mono", "DTX_OFF"], ["MC_5_1_2", 24400, "EXT", "DTX_OFF"], # paramMC ["MC_5_1_2", 48000, "BINAURAL", "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, "EXT", "DTX_OFF"], ["MC_7_1_4", 256000, "5_1", "DTX_OFF"], # SBA ["HOA3", 64000, "BINAURAL", "DTX_OFF"], ["FOA", 256000, "BINAURAL", "DTX_OFF"], ["FOA", 256000, "BINAURAL_ROOM_REVERB", "DTX_OFF"], ["HOA2", 80000, "EXT", "DTX_OFF"], ["HOA3", 512000, "5_1_4", "DTX_OFF"], ["FOA", 80000, "stereo", "DTX_OFF"], # OMASA ["OMASA_ISM1", 512000, "BINAURAL", "DTX_OFF"], ["OMASA_ISM2", 24400, "MONO", "DTX_OFF"], ["OMASA_ISM3", 80000, "7_1_4", "DTX_OFF"], ["OMASA_ISM4", 64000, "HOA3", "DTX_OFF"], ["OSBA_ISM2_HOA2", 64000, "BINAURAL", "DTX_OFF"], ["OSBA_ISM4_HOA2", 512000, "BINAURAL", "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_ISM2_HOA3", 96000, "5_1", "DTX_OFF"], ["OSBA_ISM1_HOA2", 32000, "mono", "DTX_OFF"], ] DLY_PROFILE = SCRIPTS_DIR.joinpath("dly_error_profiles/dly_error_profile_0.dat") JBM_NEUTRAL_DELAY_MS = 60 Loading Loading @@ -72,8 +109,8 @@ def get_options(in_format, bitrate, dtx): ) elif (match := re.fullmatch(r"OSBA_ISM(\d)_(.*)", in_format)) is not None: n_ism = int(match.groups()[0]) # NOTE: this will break if FOA is used in the future n_sba = int(match.groups()[1][-1]) sba_order_str = match.groups()[1] n_sba = 1 if sba_order_str == "FOA" else str(sba_order_str[-1]) options.extend(f"-ism_sba {n_ism}, -{n_sba}".split()) for i in range(1, n_ism + 1): options.append(str(TESTV_DIR.joinpath(f"stvISM{i}.csv"))) Loading @@ -83,11 +120,14 @@ def get_options(in_format, bitrate, dtx): INPUT_FILES = { "stereo": "stvST48n.wav", "ISM1": "stv1ISM48s.wav", "ISM2": "stv2ISM48s.wav", "ISM3": "stv3ISM48s.wav", "ISM4": "stv4ISM48n.wav", "MASA1TC": "stv2MASA1TC48c.wav", "MASA2TC": "stv2MASA2TC48c.wav", "MC_5_1": "stv51MC48c.wav", "MC_5_1_2": "stv512MC48c.wav", "MC_5_1_4": "stv514MC48c.wav", "MC_7_1": "stv71MC48c.wav", "MC_7_1_4": "stv714MC48c.wav", Loading @@ -100,6 +140,10 @@ INPUT_FILES = { "OMASA_ISM4": "stvOMASA_4ISM_2MASA2TC48c.wav", "OSBA_ISM2_HOA2": "stvOSBA_2ISM_2OA48c.wav", "OSBA_ISM4_HOA2": "stvOSBA_4ISM_2OA48c.wav", "OSBA_ISM4_FOA": "stvOSBA_4ISM_FOA48c.wav", "OSBA_ISM3_HOA3": "stvOSBA_3ISM_3OA48c.wav", "OSBA_ISM2_HOA3": "stvOSBA_2ISM_3OA48c.wav", "OSBA_ISM1_HOA2": "stvOSBA_1ISM_2OA48c.wav", } Loading Loading
tests/test_be_for_jbm_neutral_dly_profile.py +57 −13 Original line number Diff line number Diff line Loading @@ -15,24 +15,61 @@ DTX_OFF = "DTX_OFF" TESTCASES = [ # stereo ["stereo", 32000, "EXT", "DTX_OFF"], ["stereo", 48000, "7_1_4", "DTX_OFF"], ["ISM4", 48000, "BINAURAL", "DTX_OFF"], ["stereo", 48000, "MONO", "DTX_OFF"], ["stereo", 16400, "5_1", "DTX_OFF"], ["stereo", 256000, "7_1_4", "DTX_OFF"], # param ISM ["ISM4", 32000, "BINAURAL_ROOM_REVERB", "DTX_OFF"], ["ISM3", 24400, "STEREO", "DTX_OFF"], ["ISM4", 24400, "5_1_2", "DTX_OFF"], ["ISM3", 32000, "HOA2", "DTX_OFF"], # discrete ISM ["ISM3", 64000, "BINAURAL", "DTX_OFF"], ["MASA1TC", 24400, "BINAURAL", "DTX_OFF"], ["MASA2TC", 80000, "BINAURAL", "DTX_OFF"], ["MC_5_1", 128000, "BINAURAL", "DTX_OFF"], ["MC_5_1_4", 48000, "BINAURAL", "DTX_OFF"], ["MC_7_1", 96000, "BINAURAL", "DTX_OFF"], ["MC_7_1_4", 160000, "7_1_4", "DTX_OFF"], ["ISM1", 32000, "BINAURAL_ROOM_IR", "DTX_OFF"], ["ISM2", 96000, "7_1", "DTX_OFF"], ["ISM1", 80000, "MONO", "DTX_OFF"], ["ISM4", 128000, "FOA", "DTX_OFF"], # MASA ["MASA1TC", 24400, "BINAURAL_ROOM_IR", "DTX_OFF"], ["MASA2TC", 80000, "stereo", "DTX_OFF"], ["MASA1TC", 16400, "7_1_4", "DTX_OFF"], ["MASA2TC", 256000, "HOA3", "DTX_OFF"], ["MASA1TC", 128000, "EXT", "DTX_OFF"], # MC # McMasa ["MC_5_1", 16400, "BINAURAL_ROOM_IR", "DTX_OFF"], ["MC_7_1_4", 80000, "mono", "DTX_OFF"], ["MC_5_1_2", 24400, "EXT", "DTX_OFF"], # paramMC ["MC_5_1_2", 48000, "BINAURAL", "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, "EXT", "DTX_OFF"], ["MC_7_1_4", 256000, "5_1", "DTX_OFF"], # SBA ["HOA3", 64000, "BINAURAL", "DTX_OFF"], ["FOA", 256000, "BINAURAL", "DTX_OFF"], ["FOA", 256000, "BINAURAL_ROOM_REVERB", "DTX_OFF"], ["HOA2", 80000, "EXT", "DTX_OFF"], ["HOA3", 512000, "5_1_4", "DTX_OFF"], ["FOA", 80000, "stereo", "DTX_OFF"], # OMASA ["OMASA_ISM1", 512000, "BINAURAL", "DTX_OFF"], ["OMASA_ISM2", 24400, "MONO", "DTX_OFF"], ["OMASA_ISM3", 80000, "7_1_4", "DTX_OFF"], ["OMASA_ISM4", 64000, "HOA3", "DTX_OFF"], ["OSBA_ISM2_HOA2", 64000, "BINAURAL", "DTX_OFF"], ["OSBA_ISM4_HOA2", 512000, "BINAURAL", "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_ISM2_HOA3", 96000, "5_1", "DTX_OFF"], ["OSBA_ISM1_HOA2", 32000, "mono", "DTX_OFF"], ] DLY_PROFILE = SCRIPTS_DIR.joinpath("dly_error_profiles/dly_error_profile_0.dat") JBM_NEUTRAL_DELAY_MS = 60 Loading Loading @@ -72,8 +109,8 @@ def get_options(in_format, bitrate, dtx): ) elif (match := re.fullmatch(r"OSBA_ISM(\d)_(.*)", in_format)) is not None: n_ism = int(match.groups()[0]) # NOTE: this will break if FOA is used in the future n_sba = int(match.groups()[1][-1]) sba_order_str = match.groups()[1] n_sba = 1 if sba_order_str == "FOA" else str(sba_order_str[-1]) options.extend(f"-ism_sba {n_ism}, -{n_sba}".split()) for i in range(1, n_ism + 1): options.append(str(TESTV_DIR.joinpath(f"stvISM{i}.csv"))) Loading @@ -83,11 +120,14 @@ def get_options(in_format, bitrate, dtx): INPUT_FILES = { "stereo": "stvST48n.wav", "ISM1": "stv1ISM48s.wav", "ISM2": "stv2ISM48s.wav", "ISM3": "stv3ISM48s.wav", "ISM4": "stv4ISM48n.wav", "MASA1TC": "stv2MASA1TC48c.wav", "MASA2TC": "stv2MASA2TC48c.wav", "MC_5_1": "stv51MC48c.wav", "MC_5_1_2": "stv512MC48c.wav", "MC_5_1_4": "stv514MC48c.wav", "MC_7_1": "stv71MC48c.wav", "MC_7_1_4": "stv714MC48c.wav", Loading @@ -100,6 +140,10 @@ INPUT_FILES = { "OMASA_ISM4": "stvOMASA_4ISM_2MASA2TC48c.wav", "OSBA_ISM2_HOA2": "stvOSBA_2ISM_2OA48c.wav", "OSBA_ISM4_HOA2": "stvOSBA_4ISM_2OA48c.wav", "OSBA_ISM4_FOA": "stvOSBA_4ISM_FOA48c.wav", "OSBA_ISM3_HOA3": "stvOSBA_3ISM_3OA48c.wav", "OSBA_ISM2_HOA3": "stvOSBA_2ISM_3OA48c.wav", "OSBA_ISM1_HOA2": "stvOSBA_1ISM_2OA48c.wav", } Loading