Merge branch 'main' into update_crend_v2 (81dc9b31) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+13 −7

Original line number	Diff line number	Diff line
		@@ -396,8 +396,8 @@ stages:
		- fi
		- *build-and-create-float-ref-outputs

		- comp_args="--mld --ssnr --odg"

		- INV_LEVEL_SCALING=$(awk "BEGIN {print 1.0 / $LEVEL_SCALING}")
		- comp_args="--mld --ssnr --odg --scalefac $INV_LEVEL_SCALING"
		- summary_args="MLD DIFF SSNR ODG"
		- REPORT_ARG=""
		- if [ "$ENCODER_TEST" = "true" ]; then comp_args="${comp_args} --enc_stats"; fi
		@@ -517,7 +517,7 @@ stages:

		- exit_code=0
		- rm -rf .pytest_cache \|\| true
		- python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT --self-contained-html --junit-xml=$XML_REPORT --mld --ssnr --odg --ref_encoder_path $MERGE_TARGET_ENCODER_PATH --ref_decoder_path $MERGE_TARGET_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout > pytest_log.txt \|\| exit_code=$?
		- python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT --self-contained-html --junit-xml=$XML_REPORT --ref_encoder_path $MERGE_TARGET_ENCODER_PATH --ref_decoder_path $MERGE_TARGET_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout > pytest_log.txt \|\| exit_code=$?

		- if [ $exit_code -ne 0 ]; then
		- exit_code=$EXIT_CODE_NON_BE
		@@ -636,13 +636,16 @@ stages:
		- echo $CI_MERGE_REQUEST_TITLE > tmp.txt
		- allow_regressions_flag=$(grep -c --ignore-case "\[allow[ -]*regression\]" tmp.txt) \|\| true

		- INV_LEVEL_SCALING=$(awk "BEGIN {print 1.0 / $LEVEL_SCALING}")
		- comp_args="--mld --ssnr --odg --scalefac $INV_LEVEL_SCALING"

		### run branch first
		# this per default builds the branch and the reference and creates the reference outputs
		- *build-and-create-float-ref-outputs
		- *check-up-to-date-in-comparison-jobs
		# need to restore cache again
		- *overwrite-pytest-cache-with-artifact
		- python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT_BRANCH --self-contained-html --junit-xml=$XML_REPORT_BRANCH --mld --ssnr --odg --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout \|\| true
		- python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT_BRANCH --self-contained-html --junit-xml=$XML_REPORT_BRANCH $comp_args --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout \|\| true
		- zero_errors_branch=$(cat $XML_REPORT_BRANCH \| grep -c 'errors="0"') \|\| true
		- python3 scripts/parse_xml_report.py $XML_REPORT_BRANCH $CSV_BRANCH

		@@ -660,7 +663,7 @@ stages:
		- make -j
		# need to restore cache again
		- *overwrite-pytest-cache-with-artifact
		- python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT_MAIN --self-contained-html --junit-xml=$XML_REPORT_MAIN --mld --ssnr --odg --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout \|\| true
		- python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT_MAIN --self-contained-html --junit-xml=$XML_REPORT_MAIN $comp_args --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout \|\| true
		- python3 scripts/parse_xml_report.py $XML_REPORT_MAIN $CSV_MAIN

		### compare the two csv files for regressions
		@@ -798,10 +801,13 @@ stages:
		- fi
		- *build-float-ref-and-dut-binaries

		- INV_LEVEL_SCALING=$(awk "BEGIN {print 1.0 / $LEVEL_SCALING}")
		- comp_args="--mld --ssnr --odg --scalefac $INV_LEVEL_SCALING"

		### run pytest
		- exit_code=0
		- python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report-ref.html --self-contained-html --junit-xml=report-junit-ref.xml --mld --ssnr --odg -n auto --testcase_timeout $testcase_timeout --dut_encoder_path $REF_ENCODER_PATH --dut_decoder_path $REF_DECODER_PATH --compare_to_input \|\| exit_code=$?
		- python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report-dut.html --self-contained-html --junit-xml=report-junit-dut.xml --mld --ssnr --odg -n auto --testcase_timeout $testcase_timeout --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH --compare_to_input \|\| exit_code=$?
		- python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report-ref.html --self-contained-html --junit-xml=report-junit-ref.xml $comp_args -n auto --testcase_timeout $testcase_timeout --dut_encoder_path $REF_ENCODER_PATH --dut_decoder_path $REF_DECODER_PATH --compare_to_input \|\| exit_code=$?
		- python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report-dut.html --self-contained-html --junit-xml=report-junit-dut.xml $comp_args -n auto --testcase_timeout $testcase_timeout --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH --compare_to_input \|\| exit_code=$?
		- zero_errors_ref=$(cat report-junit-ref.xml \| grep -c 'errors="0"') \|\| true
		- zero_errors_dut=$(cat report-junit-dut.xml \| grep -c 'errors="0"') \|\| true
		- python3 scripts/parse_xml_report.py report-junit-ref.xml report-ref.csv

lib_com/cldfb.c

+83 −30

Original line number	Diff line number	Diff line
		@@ -400,8 +400,13 @@ void cldfbAnalysis_ts_fx(
		rr12_fx = L_sub( r1_fx, r2_fx ); // q -1
		ri12_fx = L_negate( L_add( i1_fx, i2_fx ) ); // q - 1
		/cplxMult(&rBuffer[2k],&rBuffer[2k+1],rr12,ri12,rot_vctr_re[k],rot_vctr_im[k]);/
		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		rBuffer_fx[2 * k] = Msub_32_32( Mpy_32_32( rr12_fx, rot_vctr_re_fx[k] ), ri12_fx, rot_vctr_im_fx[k] ); // q - 3
		rBuffer_fx[2 * k + 1] = Madd_32_32( Mpy_32_32( rr12_fx, rot_vctr_im_fx[k] ), ri12_fx, rot_vctr_re_fx[k] ); // q - 3
		#else /* OPT_AVOID_STATE_BUF_RESCALE */
		rBuffer_fx[2 * k] = L_sub( Mpy_32_32( rr12_fx, rot_vctr_re_fx[k] ), Mpy_32_32( ri12_fx, rot_vctr_im_fx[k] ) ); // q - 3
		rBuffer_fx[2 * k + 1] = L_add( Mpy_32_32( rr12_fx, rot_vctr_im_fx[k] ), Mpy_32_32( ri12_fx, rot_vctr_re_fx[k] ) ); // q - 3
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */
		move32();
		move32();

		@@ -409,8 +414,13 @@ void cldfbAnalysis_ts_fx(
		ir12_fx = L_add( r1_fx, r2_fx ); // q - 1
		ii12_fx = L_sub( i1_fx, i2_fx ); // q - 1
		/cplxMult(&iBuffer[2k],&iBuffer[2k+1],ir12,ii12,rot_vctr_re[k],rot_vctr_im[k]);/
		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		iBuffer_fx[2 * k] = Msub_32_32( Mpy_32_32( ir12_fx, rot_vctr_re_fx[k] ), ii12_fx, rot_vctr_im_fx[k] ); // q - 3
		iBuffer_fx[2 * k + 1] = Madd_32_32( Mpy_32_32( ir12_fx, rot_vctr_im_fx[k] ), ii12_fx, rot_vctr_re_fx[k] ); // q - 3
		#else /* OPT_AVOID_STATE_BUF_RESCALE */
		iBuffer_fx[2 * k] = L_sub( Mpy_32_32( ir12_fx, rot_vctr_re_fx[k] ), Mpy_32_32( ii12_fx, rot_vctr_im_fx[k] ) ); // q - 3
		iBuffer_fx[2 * k + 1] = L_add( Mpy_32_32( ir12_fx, rot_vctr_im_fx[k] ), Mpy_32_32( ii12_fx, rot_vctr_re_fx[k] ) ); // q - 3
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */
		move32();
		move32();
		}
		@@ -451,8 +461,13 @@ void cldfbAnalysis_ts_fx(
		rr12_fx = L_add( r1_fx, r2_fx ); // q - 1
		ri12_fx = L_sub( i1_fx, i2_fx ); // q - 1
		/cplxMult(&rBuffer[2k],&rBuffer[2k+1],rr12,ri12,rot_vctr_re[k],rot_vctr_im[k]);/
		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		rBuffer_fx[2 * k] = Msub_32_32( Mpy_32_32( rr12_fx, rot_vctr_re_fx[k] ), ri12_fx, rot_vctr_im_fx[k] ); // q - 3
		rBuffer_fx[2 * k + 1] = Madd_32_32( Mpy_32_32( rr12_fx, rot_vctr_im_fx[k] ), ri12_fx, rot_vctr_re_fx[k] ); // q - 3
		#else /* OPT_AVOID_STATE_BUF_RESCALE */
		rBuffer_fx[2 * k] = L_sub( Mpy_32_32( rr12_fx, rot_vctr_re_fx[k] ), Mpy_32_32( ri12_fx, rot_vctr_im_fx[k] ) ); // q - 3
		rBuffer_fx[2 * k + 1] = L_add( Mpy_32_32( rr12_fx, rot_vctr_im_fx[k] ), Mpy_32_32( ri12_fx, rot_vctr_re_fx[k] ) ); // q - 3
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */
		move32();
		move32();

		@@ -460,8 +475,13 @@ void cldfbAnalysis_ts_fx(
		ir12_fx = L_sub( r1_fx, r2_fx ); // q - 1
		ii12_fx = L_add( i1_fx, i2_fx ); // q - 1
		/cplxMult(&iBuffer[2k],&iBuffer[2k+1],ir12,ii12,rot_vctr_re[k],rot_vctr_im[k]);/
		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		iBuffer_fx[2 * k] = Msub_32_32( Mpy_32_32( ir12_fx, rot_vctr_re_fx[k] ), ii12_fx, rot_vctr_im_fx[k] ); // q - 3
		iBuffer_fx[2 * k + 1] = Madd_32_32( Mpy_32_32( ir12_fx, rot_vctr_im_fx[k] ), ii12_fx, rot_vctr_re_fx[k] ); // q - 3
		#else /* OPT_AVOID_STATE_BUF_RESCALE */
		iBuffer_fx[2 * k] = L_sub( Mpy_32_32( ir12_fx, rot_vctr_re_fx[k] ), Mpy_32_32( ii12_fx, rot_vctr_im_fx[k] ) ); // q - 3
		iBuffer_fx[2 * k + 1] = L_add( Mpy_32_32( ir12_fx, rot_vctr_im_fx[k] ), Mpy_32_32( ii12_fx, rot_vctr_re_fx[k] ) ); // q - 3
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */
		move32();
		move32();
		}
		@@ -490,8 +510,13 @@ void cldfbAnalysis_ts_fx(
		FOR( k = 0; k < M2; k++ )
		{
		/cplxMult(&realBuffer[M1-1-(2k)],&realBuffer[2k],rBuffer[2k],rBuffer[2k+1],rot_vctr_re[k],rot_vctr_im[k]);/
		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		realBuffer_fx[( ( M1 - 1 ) - ( k * 2 ) )] = Msub_32_32( Mpy_32_32( rBuffer_fx[2 * k], rot_vctr_re_fx[k] ), rBuffer_fx[2 * k + 1], rot_vctr_im_fx[k] ); // q - 5
		realBuffer_fx[2 * k] = Madd_32_32( Mpy_32_32( rBuffer_fx[2 * k], rot_vctr_im_fx[k] ), rBuffer_fx[2 * k + 1], rot_vctr_re_fx[k] ); // q - 5
		#else /* OPT_AVOID_STATE_BUF_RESCALE */
		realBuffer_fx[( ( M1 - 1 ) - ( k * 2 ) )] = L_sub( Mpy_32_32( rBuffer_fx[2 * k], rot_vctr_re_fx[k] ), Mpy_32_32( rBuffer_fx[2 * k + 1], rot_vctr_im_fx[k] ) ); // q - 5
		realBuffer_fx[2 * k] = L_add( Mpy_32_32( rBuffer_fx[2 * k], rot_vctr_im_fx[k] ), Mpy_32_32( rBuffer_fx[2 * k + 1], rot_vctr_re_fx[k] ) ); // q - 5
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */
		move32();
		move32();
		}
		@@ -520,8 +545,13 @@ void cldfbAnalysis_ts_fx(
		{
		/* do it inplace */
		/cplxMult(&imagBuffer[2k],&imagBuffer[M1-1-(2k)],iBuffer[2k],iBuffer[2k+1],rot_vctr_re[k],rot_vctr_im[k]);/
		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		imagBuffer_fx[2 * k] = Msub_32_32( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_re_fx[k] ), iBuffer_fx[2 * k + 1], rot_vctr_im_fx[k] ); // q - 5
		imagBuffer_fx[( M1 - 1 ) - ( k * 2 )] = Madd_32_32( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_im_fx[k] ), iBuffer_fx[2 * k + 1], rot_vctr_re_fx[k] ); // q - 5
		#else /* OPT_AVOID_STATE_BUF_RESCALE */
		imagBuffer_fx[2 * k] = L_sub( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_re_fx[k] ), Mpy_32_32( iBuffer_fx[2 * k + 1], rot_vctr_im_fx[k] ) ); // q - 5
		imagBuffer_fx[( M1 - 1 ) - ( k * 2 )] = L_add( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_im_fx[k] ), Mpy_32_32( iBuffer_fx[2 * k + 1], rot_vctr_re_fx[k] ) ); // q - 5
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */
		move32();
		move32();
		}
		@@ -542,8 +572,13 @@ void cldfbAnalysis_ts_fx(
		/cplxMult(&realBuffer[k], &imagBuffer[k], realBuffer[k], imagBuffer[k], rot_vctr_delay_re[k], rot_vctr_delay_im[k]);/
		/*realBuffer[k] = rBuffer[k];
		imagBuffer[k] = iBuffer[k];*/
		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		cplx_aux_fx = Msub_32_32( Mpy_32_32( realBuffer_fx[k], rot_vctr_delay_re_fx[k] ), imagBuffer_fx[k], rot_vctr_delay_im_fx[k] ); // q - 5
		imagBuffer_fx[k] = Madd_32_32( Mpy_32_32( realBuffer_fx[k], rot_vctr_delay_im_fx[k] ), imagBuffer_fx[k], rot_vctr_delay_re_fx[k] ); // q - 5
		#else /* OPT_AVOID_STATE_BUF_RESCALE */
		cplx_aux_fx = L_sub( Mpy_32_32( realBuffer_fx[k], rot_vctr_delay_re_fx[k] ), Mpy_32_32( imagBuffer_fx[k], rot_vctr_delay_im_fx[k] ) ); // q - 5
		imagBuffer_fx[k] = L_add( Mpy_32_32( realBuffer_fx[k], rot_vctr_delay_im_fx[k] ), Mpy_32_32( imagBuffer_fx[k], rot_vctr_delay_re_fx[k] ) ); // q - 5
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */
		realBuffer_fx[k] = cplx_aux_fx;
		move32();
		move32();
		@@ -1091,6 +1126,7 @@ void cldfbAnalysis_ts_fx_fixed_q(

		return;
		}

		/-------------------------------------------------------------------
		* cldfbSynthesis_ivas()
		*
		@@ -1102,6 +1138,9 @@ void cldfbSynthesis_ivas_fx(
		Word32 timeOut_fx, / o : output time domain samples Qx - 1*/
		const Word16 samplesToProcess, /* i : number of processed samples */
		const Word16 shift, /* i : scale for state buffer */
		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		const Word16 out_shift, /* i : scale for output buffer */
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */
		HANDLE_CLDFB_FILTER_BANK h_cldfb /* i : filter bank state */
		)
		{
		@@ -1295,11 +1334,11 @@ void cldfbSynthesis_ivas_fx(
		FOR( i = 0; i < L2; i++ )
		{
		Word32 prod = L_shl_sat( Mpy_32_16_1( new_samples_fx[L2 - 1 - i], p_filter_sf ), shift );
		accu0 = Madd_32_16( synthesisBuffer_fx[i], prod, p_filter[i] ); // Qx - 1
		accu1 = Madd_32_16( synthesisBuffer_fx[1 * L2 + i], prod, p_filter[( 1 * L2 + i )] ); // Qx - 1
		accu2 = Madd_32_16( synthesisBuffer_fx[2 * L2 + i], prod, p_filter[( 2 * L2 + i )] ); // Qx - 1
		accu3 = Madd_32_16( synthesisBuffer_fx[3 * L2 + i], prod, p_filter[( 3 * L2 + i )] ); // Qx - 1
		accu4 = Madd_32_16( synthesisBuffer_fx[4 * L2 + i], prod, p_filter[( 4 * L2 + i )] ); // Qx - 1
		accu0 = Madd_32_16( synthesisBuffer_fx[i], prod, p_filter[i] ); // Qx -1 + shift
		accu1 = Madd_32_16( synthesisBuffer_fx[1 * L2 + i], prod, p_filter[( 1 * L2 + i )] ); // Qx -1 + shift
		accu2 = Madd_32_16( synthesisBuffer_fx[2 * L2 + i], prod, p_filter[( 2 * L2 + i )] ); // Qx -1 + shift
		accu3 = Madd_32_16( synthesisBuffer_fx[3 * L2 + i], prod, p_filter[( 3 * L2 + i )] ); // Qx -1 + shift
		accu4 = Madd_32_16( synthesisBuffer_fx[4 * L2 + i], prod, p_filter[( 4 * L2 + i )] ); // Qx -1 + shift

		synthesisBuffer_fx[i] = accu0;
		move32();
		@@ -1314,11 +1353,26 @@ void cldfbSynthesis_ivas_fx(
		}
		}

		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		IF( 0 == out_shift )
		{
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */
		FOR( i = 0; i < M1; i++ )
		{
		ptr_time_out_fx[( M1 - 1 ) - i] = synthesisBuffer_fx[4 * L2 + M1 + i];
		move32();
		}
		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		}
		ELSE
		{
		FOR( i = 0; i < M1; i++ )
		{
		ptr_time_out_fx[( M1 - 1 ) - i] = L_shl_sat( synthesisBuffer_fx[4 * L2 + M1 + i], out_shift );
		move32();
		}
		}
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */

		ptr_time_out_fx += M1;

		@@ -1333,7 +1387,6 @@ void cldfbSynthesis_ivas_fx(
		return;
		}


		void configureCldfb_ivas_enc_fx(
		HANDLE_CLDFB_FILTER_BANK h_cldfb, /* i/o: filter bank handle */
		const Word32 sampling_rate /* i : sampling rate */

lib_com/ivas_prot_fx.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -4994,6 +4994,15 @@ void ivas_dirac_dec_get_response_fx(
		const Word16 ambisonics_order,
		Word16 Q_out );

		#ifdef FIX_1310_SPEEDUP_ivas_dirac_dec_get_response_fx
		/This is a derivate to ivas_dirac_dec_get_response_fx with fixed Q_out=29/
		void ivas_dirac_dec_get_response_fx_29(
		const Word16 azimuth,
		const Word16 elevation,
		Word32 response_fx, /Q_out=29*/
		const Word16 ambisonics_order );
		#endif

		void calculate_hodirac_sector_parameters_fx(
		DIRAC_ENC_HANDLE hDirAC, /* i : DirAC handle */
		Word32 RealBuffer_fx[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], /* i : signal vector (L+1)^2 x N_bins, real part */

lib_com/ivas_spar_com_fx.c

+127 −0

Original line number	Diff line number	Diff line
		@@ -7164,6 +7164,133 @@ void ivas_dirac_dec_get_response_fx(
		return;
		}

		#ifdef FIX_1310_SPEEDUP_ivas_dirac_dec_get_response_fx
		/This is a derivate to ivas_dirac_dec_get_response_fx with fixed Q_out=29/
		void ivas_dirac_dec_get_response_fx_29(
		const Word16 azimuth,
		const Word16 elevation,
		Word32 response_fx, /Q_out*/
		const Word16 ambisonics_order )
		{
		Word16 index_azimuth, index_elevation;
		Word16 el, az;
		Word32 cos_1_fx, cos_2_fx, sin_1_fx, cos_az_fx[3];
		Word32 sin_az_fx[3];
		Word32 f_fx;
		Word32 c_fx_better;
		Word16 l, m;
		Word16 b, b1, b_2, b1_2;
		// Word16 Q_out = 29;

		index_azimuth = add( azimuth, 180 ) % 360;
		move16();
		index_elevation = add( elevation, 90 );

		Word32 e_fac = L_add( 0x7FFFFFFF, 0 );

		if ( GT_16( index_elevation, 90 ) )
		{
		e_fac = L_add( 0x80000000, 0 );
		}


		el = index_elevation;
		move16();

		if ( GT_16( index_elevation, 90 ) )
		{
		el = sub( 180, index_elevation );
		}

		az = index_azimuth;
		move16();

		if ( GT_16( index_azimuth, 180 ) )
		{
		az = sub( 360, index_azimuth );
		}

		f_fx = 1;
		move16();

		if ( GT_16( index_azimuth, 180 ) )
		{
		f_fx = -1;
		}

		cos_1_fx = L_shr( dirac_gains_trg_term_fx[az][0], 1 ); // q30
		cos_2_fx = L_shl( Mpy_32_32( cos_1_fx, cos_1_fx ), 1 ); // q30
		sin_1_fx = L_shr( dirac_gains_trg_term_fx[az][1], 1 ); // q30

		if ( EQ_32( f_fx, -1 ) )
		{
		sin_1_fx = L_negate( sin_1_fx ); // q30
		}
		cos_az_fx[0] = cos_1_fx; // q30
		move32();
		cos_az_fx[1] = L_shl( L_sub( cos_2_fx, ONE_IN_Q29 /0.5 q30/ ), 1 ); /q30/
		move32();
		cos_az_fx[2] = L_sub( L_shl( Mpy_32_32( cos_1_fx, cos_az_fx[1] ), 2 ), cos_az_fx[0] /* cos_az_fx[0] q30/ ); /q30*/
		move32();
		sin_az_fx[0] = sin_1_fx; /q30/
		move32();
		sin_az_fx[1] = L_shl( Mpy_32_32( sin_1_fx, cos_1_fx ), 2 ); /q30/
		move32();
		sin_az_fx[2] = L_shl( Mpy_32_32( sin_1_fx, L_sub( cos_2_fx, ONE_IN_Q28 /1/4 q30/ ) ), 3 ); /q30/
		move32();

		response_fx[0] = 0x20000000;
		move32();

		FOR( l = 1; l <= ambisonics_order; l++ )
		{
		Word16 a;
		b_2 = imult1616( l, l );
		b1_2 = add( b_2, shl( l, 1 ) );
		FOR( m = 0; m < l; m += 2 )
		{
		b = b_2 + m;
		a = dirac_gains_P_idx[b];

		c_fx_better = local_result_table[el][a]; // q30
		move32();
		response_fx[b] = Mpy_32_32( c_fx_better, sin_az_fx[l - m - 1] ); // Q_out
		move32();

		b1 = b1_2 - m;
		response_fx[b1] = Mpy_32_32( c_fx_better, cos_az_fx[l - m - 1] ); // Q_out
		move32();
		}

		FOR( m = 1; m < l; m += 2 )
		{
		b = b_2 + m;
		a = dirac_gains_P_idx[b];
		c_fx_better = local_result_table[el][a]; // q30
		move32();
		c_fx_better = Mpy_32_32( c_fx_better, e_fac ); // q30
		response_fx[b] = Mpy_32_32( c_fx_better, sin_az_fx[l - m - 1] ); // Q_out
		move32();

		b1 = b1_2 - m;
		response_fx[b1] = Mpy_32_32( c_fx_better, cos_az_fx[l - m - 1] ); // Q_out
		move32();
		}

		b = add( b_2, l );
		a = dirac_gains_P_idx[b];
		c_fx_better = local_result_table_2[el][a]; // q30
		move32();
		if ( s_and( l, 0x01 ) )
		{
		c_fx_better = Mpy_32_32( c_fx_better, e_fac ); // q30
		}
		response_fx[b] = L_shl( c_fx_better, -1 ); // Q_out
		move32();
		}
		return;
		}
		#endif /FIX_1310_SPEEDUP_ivas_dirac_dec_get_response_fx/
		/-----------------------------------------------------------------------------------------
		* Function ivas_get_bits_to_encode
		*

lib_com/options.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -85,4 +85,7 @@

		/* Note: each compile switch (FIX_1101_...) is independent from the other ones */
		//#define OPT_STEREO_32KBPS_V1 /* Optimization made in stereo decoding path for 32kbps decoding */
		#define OPT_AVOID_STATE_BUF_RESCALE /* Optimization made to avoid rescale of synth state buffer */
		#define FIX_1310_SPEEDUP_ivas_dirac_dec_get_response_fx /FhG: WMOPS tuning, nonbe/
		#define FIX_1310_SPEEDUP_ivas_dirac_dec_output_synthesis_process_slot /FhG: WMOPS tuning, nonbe/
		#endif