Addressing review comments (d2fc2f43) · Commits · IVAS Codec Public Collaboration / IVAS Codec

tests/test_sba_bs_dec_plc.py

+7 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,9 @@ def test_sba_plc_system(
		else:
		pytest.skip()
		tag = tag + fs + 'c'
		gain_flag = -1
		if ivas_br in ['13200','16400','32000']:
		gain_flag = 1

		# dec
		sba_dec_plc(
		@@ -111,6 +114,7 @@ def test_sba_plc_system(
		SID,
		plc_pattern,
		update_ref,
		gain_flag,
		keep_files,
		)

		@@ -130,12 +134,15 @@ def sba_dec_plc(
		SID,
		plc_pattern,
		update_ref,
		gain_flag,
		keep_files,
		):

		# ------------ run cmd ------------

		tag_out = f"{tag}_ivasbr{ivas_br[:-3]}k_DTX{dtx}"
		if gain_flag != -1:
		tag_out += f'_Gain{gain_flag}'
		plc_tag_out = f"{tag_out}_{plc_pattern}"

		dut_out_dir = f"{dut_base_path}/sba_bs/raw"

tests/test_sba_bs_enc.py

+34 −2

Original line number	Diff line number	Diff line
		@@ -100,6 +100,7 @@ def test_bypass_enc(
		ivas_br = '256000'
		dtx = '0'
		max_bw = "FB"
		gain_flag = -1
		sba_order = "+1"
		output_config = "FOA"

		@@ -120,6 +121,7 @@ def test_bypass_enc(
		bypass,
		sba_order,
		update_ref,
		gain_flag,
		cut_testv=True
		)

		@@ -138,6 +140,7 @@ def test_bypass_enc(
		bypass,
		output_config,
		update_ref,
		gain_flag,
		keep_files,
		)

		@@ -164,6 +167,9 @@ def test_sba_enc_system(
		fs,
		):
		SID = 0
		gain_flag = -1
		if ivas_br in ['13200','16400','32000']:
		gain_flag = 1
		if dtx == '1' and ivas_br not in ['13200','16400','32000','64000']:
		# skip high bitrates for DTX until DTX issue is resolved
		pytest.skip()
		@@ -179,6 +185,8 @@ def test_sba_enc_system(
		bypass = -1
		sba_order = "+1"
		output_config = "FOA"
		if gain_flag == 1:
		cut_gain = "16.0"
		if dtx == '1':
		cut_gain = ".004"
		else:
		@@ -200,6 +208,7 @@ def test_sba_enc_system(
		bypass,
		sba_order,
		update_ref,
		gain_flag,
		cut_gain=cut_gain,
		create_dutenc=True,
		cut_testv=True
		@@ -220,6 +229,7 @@ def test_sba_enc_system(
		bypass,
		output_config,
		update_ref,
		gain_flag,
		keep_files,
		)

		@@ -242,6 +252,7 @@ def test_spar_hoa2_enc_system(
		):
		fs = '48'
		dtx = '0'
		gain_flag = -1

		tag = tag + fs + 'c'
		max_bw = "FB"
		@@ -266,6 +277,7 @@ def test_spar_hoa2_enc_system(
		bypass,
		sba_order,
		update_ref,
		gain_flag,
		)

		# dec
		@@ -283,6 +295,7 @@ def test_spar_hoa2_enc_system(
		bypass,
		output_config,
		update_ref,
		gain_flag,
		keep_files,
		)

		@@ -305,6 +318,8 @@ def test_spar_hoa3_enc_system(
		):
		fs = '48'
		dtx = '0'
		gain_flag = -1

		tag = tag + fs + 'c'
		max_bw = "FB"
		bypass = -1
		@@ -328,6 +343,7 @@ def test_spar_hoa3_enc_system(
		bypass,
		sba_order,
		update_ref,
		gain_flag,
		)

		# dec
		@@ -345,6 +361,7 @@ def test_spar_hoa3_enc_system(
		bypass,
		output_config,
		update_ref,
		gain_flag,
		keep_files,
		)

		@@ -380,6 +397,7 @@ def test_sba_enc_BWforce_system(
		bw = sample_rate_bw_idx[1]
		tag = tag + fs + 'c'
		bypass = -1
		gain_flag = -1
		sba_order = "+1"
		output_config = "FOA"

		@@ -400,6 +418,7 @@ def test_sba_enc_BWforce_system(
		bypass,
		sba_order,
		update_ref,
		gain_flag,
		cut_testv=True
		)

		@@ -418,6 +437,7 @@ def test_sba_enc_BWforce_system(
		bypass,
		output_config,
		update_ref,
		gain_flag,
		keep_files,
		)

		@@ -440,6 +460,7 @@ def sba_enc(
		bypass,
		sba_order,
		update_ref,
		gain_flag,
		cut_gain='1.0',
		create_dutenc=False,
		cut_testv=False
		@@ -464,12 +485,17 @@ def sba_enc(
		if ivas_br == 'sw_24k4_256k.bin':
		ivas_br = f"{br_switch_file_path}/sw_24k4_256k.bin"
		short_tag_ext = ""
		if gain_flag != -1:
		short_tag_ext += f'_Gain{gain_flag}'
		if SID == 1:
		short_tag_ext += f'_SID'
		# we update only bypass = 0/2 (bypass 1 is the same as the baseline)
		if bypass in [0, 2]:
		short_tag_ext += f"_pca{bypass}"
		# to avoid conflicting names in case of parallel test execution, differentiate all cases
		if gain_flag != -1:
		long_tag_ext = f"_Gain{gain_flag}"
		else:
		long_tag_ext = f"_pca{bypass}"
		if SID == 1:
		long_tag_ext += f"_SID"
		@@ -566,6 +592,7 @@ def sba_dec(
		bypass,
		output_config,
		update_ref,
		gain_flag,
		keep_files,
		):

		@@ -578,12 +605,17 @@ def sba_dec(
		tag_out = f"{tag}_ivasbr{ivas_br[:-3]}k_DTX{dtx}"

		short_tag_ext = ""
		if gain_flag != -1:
		short_tag_ext += f'_Gain{gain_flag}'
		# we update only bypass = 0/2 (bypass 1 is the same as the baseline)
		if bypass in [0, 2]:
		short_tag_ext += f"_pca{bypass}"
		if SID == 1:
		short_tag_ext += f'_SID_cut'
		# to avoid conflicting names in case of parallel test execution, differentiate all cases
		if gain_flag != -1:
		long_tag_ext = f"_Gain{gain_flag}"
		else:
		long_tag_ext = f"_pca{bypass}"
		if SID == 1:
		long_tag_ext += f"_SID_cut"