fix clang (a881c3b9) · Commits · SA4 / Audio / IVAS BASOP

lib_enc/acelp_core_switch_enc_fx.c

+12 −10

Original line number	Diff line number	Diff line
		@@ -414,7 +414,8 @@ static void encod_gen_voic_core_switch_fx(
		pitch = pit_encode_fx( hBstr,
		st_fx->acelp_cfg.pitch_bits, core_bitrate, 0, L_frame, GENERIC, &pitch_limit_flag, 0, exc, L_SUBFR, T_op, &T0_min, &T0_max, &T0, &T0_frac, h1, xn, 0 /hStereoTD->tdm_Pitch_reuse_flag/, dummyF /hStereoTD->tdm_Pri_pitch_buf/
		#if defined REUSE_EVS_BE_ACELP_PITCH && !defined REUSE_EVS_ACELP_PITCH_NORM_CORR
		, st_fx->element_mode, Q_new
		,
		st_fx->element_mode, Q_new
		#endif
		); /* Q6 */

		@@ -629,7 +630,8 @@ static void encod_gen_voic_core_switch_ivas_fx(
		pitch = pit_encode_fx( hBstr,
		st_fx->acelp_cfg.pitch_bits, core_bitrate, 0, L_frame, GENERIC, &pitch_limit_flag, 0, exc, L_SUBFR, T_op, &T0_min, &T0_max, &T0, &T0_frac, h1, xn, 0 /hStereoTD->tdm_Pitch_reuse_flag/, dummyF /hStereoTD->tdm_Pri_pitch_buf/
		#if defined REUSE_EVS_BE_ACELP_PITCH && !defined REUSE_EVS_ACELP_PITCH_NORM_CORR
		, st_fx->element_mode, Q_new
		,
		st_fx->element_mode, Q_new
		#endif
		); /* Q6 */
		#endif

lib_enc/enc_amr_wb_fx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -148,7 +148,8 @@ void encod_amr_wb_fx(
		*pt_pitch = pit_encode_fx( hBstr, st->acelp_cfg.pitch_bits, st->core_brate, 1, L_FRAME, -1, &pitch_limit_flag, i_subfr, exc,
		L_SUBFR, T_op, &T0_min, &T0_max, &T0, &T0_frac, h1, xn, 0 /hStereoTD->tdm_Pitch_reuse_flag/, NULL /hStereoTD->tdm_Pri_pitch_buf/
		#if defined REUSE_EVS_BE_ACELP_PITCH && !defined REUSE_EVS_ACELP_PITCH_NORM_CORR
		, 0, Q_new
		,
		0, Q_new
		#endif
		);

lib_enc/enc_gen_voic_fx.c

+14 −11

Original line number	Diff line number	Diff line
		@@ -232,7 +232,8 @@ void encod_gen_voic_fx(
		*pt_pitch_fx = pit_encode_fx( hBstr, st_fx->acelp_cfg.pitch_bits, st_fx->core_brate, 0, L_frame, st_fx->coder_type, &pitch_limit_flag, i_subfr_fx, exc_fx,
		L_SUBFR, st_fx->pitch, &T0_min_fx, &T0_max_fx, &T0_fx, &T0_frac_fx, h1_fx, xn_fx, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf
		#if defined REUSE_EVS_BE_ACELP_PITCH && !defined REUSE_EVS_ACELP_PITCH_NORM_CORR
		, st_fx->element_mode, Q_new
		,
		st_fx->element_mode, Q_new
		#endif
		); /* Q6 */
		tbe_celp_exc( L_frame, i_subfr_fx, T0_fx, T0_frac_fx, &error_fx, bwe_exc_fx );
		@@ -299,7 +300,8 @@ void encod_gen_voic_fx(
		gain_enc_lbr_fx( hBstr, st_fx->acelp_cfg.gains_mode, st_fx->coder_type, i_subfr_fx, xn_fx, y1_fx, shift_wsp, y2_fx, code_fx,
		&gain_pit_fx, &gain_code_fx, &gain_inov_fx, &norm_gain_code_fx, g_corr_fx, gc_mem, gp_mem, clip_gain_fx, L_SUBFR
		#ifdef REUSE_EVS_BE_GAINQ_LBR
		, st_fx->element_mode
		,
		st_fx->element_mode
		#endif
		);
		}
		@@ -612,7 +614,8 @@ void encod_gen_voic_ivas_fx(
		*pt_pitch_fx = pit_encode_fx( hBstr, st_fx->acelp_cfg.pitch_bits, st_fx->core_brate, 0, L_frame, st_fx->coder_type, &pitch_limit_flag, i_subfr_fx, exc_fx,
		L_SUBFR, st_fx->pitch, &T0_min_fx, &T0_max_fx, &T0_fx, &T0_frac_fx, h1_fx, xn_fx, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf
		#if defined REUSE_EVS_BE_ACELP_PITCH && !defined REUSE_EVS_ACELP_PITCH_NORM_CORR
		, st_fx->element_mode, Q_new
		,
		st_fx->element_mode, Q_new
		#endif
		); /* Q6 */
		#endif

lib_enc/enc_pit_exc_fx.c

+12 −9

Original line number	Diff line number	Diff line
		@@ -265,7 +265,8 @@ void enc_pit_exc_fx(
		*pt_pitch = pit_encode_fx( hBstr, st_fx->acelp_cfg.pitch_bits, Pitch_BR, 0, st_fx->L_frame, Pitch_CT, &pitch_limit_flag, i_subfr, exc,
		L_subfr, st_fx->pitch, &T0_min, &T0_max, T0, T0_frac, h1, xn, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf
		#if defined REUSE_EVS_BE_ACELP_PITCH && !defined REUSE_EVS_ACELP_PITCH_NORM_CORR
		, st_fx->element_mode, Q_new
		,
		st_fx->element_mode, Q_new
		#endif
		); /* Q6 */
		/-----------------------------------------------------------------
		@@ -334,7 +335,8 @@ void enc_pit_exc_fx(

		gain_enc_lbr_fx( st_fx->hBstr, st_fx->acelp_cfg.gains_mode, GENERIC, i_subfr, xn, y1, shift_wsp, y2, code, &gain_pit, &gain_code, &gain_inov, &norm_gain_code, g_corr, gc_mem, gp_mem, clip_gain, 2 * L_SUBFR
		#ifdef REUSE_EVS_BE_GAINQ_LBR
		, st_fx->element_mode
		,
		st_fx->element_mode
		#endif
		);
		}
		@@ -754,7 +756,8 @@ void enc_pit_exc_ivas_fx(
		*pt_pitch = pit_encode_fx( hBstr, st_fx->acelp_cfg.pitch_bits, Pitch_BR, 0, st_fx->L_frame, Pitch_CT, &pitch_limit_flag, i_subfr, exc,
		L_subfr, st_fx->pitch, &T0_min, &T0_max, T0, T0_frac, h1, xn, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf
		#if defined REUSE_EVS_BE_ACELP_PITCH && !defined REUSE_EVS_ACELP_PITCH_NORM_CORR
		, st_fx->element_mode, Q_new
		,
		st_fx->element_mode, Q_new
		#endif
		); /* Q6 */
		#endif
		@@ -831,11 +834,11 @@ void enc_pit_exc_ivas_fx(
		#else
		gain_enc_lbr_fx( st_fx->hBstr, st_fx->acelp_cfg.gains_mode, GENERIC, i_subfr, xn, y1, sub( shift_wsp, 1 ), y2, code, &gain_pit, &gain_code, &gain_inov, &norm_gain_code, g_corr, gc_mem, gp_mem, clip_gain, 2 * L_SUBFR
		#ifdef REUSE_EVS_BE_GAINQ_LBR
		, st_fx->element_mode
		,
		st_fx->element_mode
		#endif
		);
		#endif

		}
		ELSE
		{

lib_enc/gain_enc_fx.c

+6 −7

Original line number	Diff line number	Diff line
		@@ -2175,7 +2175,6 @@ void gain_enc_lbr_fx(
		// 10 in Q27 , ( 10 * log10( Ecode ) )
		L_tmp1 = Mpy_32_32( L_tmp, 1342177280 ); // Q25 + exp + 1 + Q27 - 32 = Q21 + exp
		L_tmp1 = L_shr( L_tmp1, add( 7, exp ) ); // Q21 + exp - 7 - exp = Q14

		}
		ELSE
		#endif