code review cleanup (f5085133) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_rom_com.c

+17 −17

Original line number	Diff line number	Diff line
		@@ -3124,23 +3124,23 @@ const int16_t ivas_lfe_min_shift_tbl[IVAS_LFE_NUM_COEFFS_IN_SUBGRP] = { 1, 0 };

		const float ivas_lfe_lpf_delay[2] = { 0.00175f, 0.0035f };

		const float d_hamm_lfe_plc[LFE_PLC_LENANA / 2] =
		{
		0.08000000000000002, 0.08015895227847719, 0.08063569926248770, 0.08142991147368656, 0.08254104003450596, 0.08396831704748331, 0.08571075612595230, 0.08776715307573196,
		0.09013608672734141, 0.09281591991816535, 0.09580480062389246, 0.09910066323844335, 0.10270123000150438, 0.10660401257268071, 0.11080631375118072, 0.11530522933984272,
		0.12009765015221685, 0.12518026416131367, 0.13054955878853602, 0.13620182333121073, 0.14213315152704381, 0.14833944425372619, 0.15481641236182375, 0.16155957963899570,
		0.16856428590349043, 0.17582569022478273, 0.18333877426912554, 0.19109834576770490, 0.19909904210500018, 0.20733533402487142, 0.21580152945181053, 0.22449177742471671,
		0.23340007214047787, 0.24252025710456171, 0.25184602938575001, 0.26137094397207467, 0.27108841822494550, 0.28099173642839037, 0.29107405443026624, 0.30132840437223085,
		0.31174769950520753, 0.32232473908701620, 0.33305221335878232, 0.34392270859668939, 0.35492871223557998, 0.36606261806086549, 0.37731673146515798, 0.38868327476598852,
		0.40015439258093899, 0.41172215725647360, 0.42337857434671339, 0.43511558813837425, 0.44692508721804453, 0.45879891007795709, 0.47072885075638249, 0.48270666450874267,
		0.49472407350552849, 0.50677277255308162, 0.51884443483328757, 0.53093071765821398, 0.54302326823571601, 0.55511372944202464, 0.56719374559732838, 0.57925496824035816,
		0.59128906189798180, 0.60328770984582458, 0.61524261985593010, 0.62714552992749328, 0.63898821399670414, 0.65076248762175315, 0.66246021363907504, 0.67407330778691554,
		0.68559374429233988, 0.69701356141781945, 0.70832486696356345, 0.71951984372179334, 0.73059075487919101, 0.74152994936378558, 0.75232986713258543, 0.76298304439630038,
		0.77348211877754336, 0.78381983439894576, 0.79398904689767136, 0.80398272836286389, 0.81379397219261318, 0.82341599786708708, 0.83284215563452701, 0.84206593110687011,
		0.85108094976182280, 0.85988098134827329, 0.86845994419199846, 0.87681190939868969, 0.88493110495139349, 0.89281191969953333, 0.90044890723675941, 0.90783678966494241,
		0.91497046124171255, 0.92184499190902180, 0.92845563070029180, 0.93479780902379184, 0.94086714381997805, 0.94665944059061280, 0.95217069629756890, 0.95739710212931617,
		0.96233504613317988, 0.96698111571154954, 0.97133209998031445, 0.97538499198789563, 0.97913699079334116, 0.98258550340204664, 0.98572814655776630, 0.98856274838967395,
		0.99108734991333569, 0.99330020638455863, 0.99519978850517732, 0.99678478347994692, 0.99805409592381300, 0.99900684861892730, 0.99964238312089115, 0.99996026021380402
		const float hamm_lfe_plc[LFE_PLC_LENANA / 2] =
		{
		0.08000000000000002f, 0.08015895227847719f, 0.08063569926248770f, 0.08142991147368656f, 0.08254104003450596f, 0.08396831704748331f, 0.08571075612595230f, 0.08776715307573196f,
		0.09013608672734141f, 0.09281591991816535f, 0.09580480062389246f, 0.09910066323844335f, 0.10270123000150438f, 0.10660401257268071f, 0.11080631375118072f, 0.11530522933984272f,
		0.12009765015221685f, 0.12518026416131367f, 0.13054955878853602f, 0.13620182333121073f, 0.14213315152704381f, 0.14833944425372619f, 0.15481641236182375f, 0.16155957963899570f,
		0.16856428590349043f, 0.17582569022478273f, 0.18333877426912554f, 0.19109834576770490f, 0.19909904210500018f, 0.20733533402487142f, 0.21580152945181053f, 0.22449177742471671f,
		0.23340007214047787f, 0.24252025710456171f, 0.25184602938575001f, 0.26137094397207467f, 0.27108841822494550f, 0.28099173642839037f, 0.29107405443026624f, 0.30132840437223085f,
		0.31174769950520753f, 0.32232473908701620f, 0.33305221335878232f, 0.34392270859668939f, 0.35492871223557998f, 0.36606261806086549f, 0.37731673146515798f, 0.38868327476598852f,
		0.40015439258093899f, 0.41172215725647360f, 0.42337857434671339f, 0.43511558813837425f, 0.44692508721804453f, 0.45879891007795709f, 0.47072885075638249f, 0.48270666450874267f,
		0.49472407350552849f, 0.50677277255308162f, 0.51884443483328757f, 0.53093071765821398f, 0.54302326823571601f, 0.55511372944202464f, 0.56719374559732838f, 0.57925496824035816f,
		0.59128906189798180f, 0.60328770984582458f, 0.61524261985593010f, 0.62714552992749328f, 0.63898821399670414f, 0.65076248762175315f, 0.66246021363907504f, 0.67407330778691554f,
		0.68559374429233988f, 0.69701356141781945f, 0.70832486696356345f, 0.71951984372179334f, 0.73059075487919101f, 0.74152994936378558f, 0.75232986713258543f, 0.76298304439630038f,
		0.77348211877754336f, 0.78381983439894576f, 0.79398904689767136f, 0.80398272836286389f, 0.81379397219261318f, 0.82341599786708708f, 0.83284215563452701f, 0.84206593110687011f,
		0.85108094976182280f, 0.85988098134827329f, 0.86845994419199846f, 0.87681190939868969f, 0.88493110495139349f, 0.89281191969953333f, 0.90044890723675941f, 0.90783678966494241f,
		0.91497046124171255f, 0.92184499190902180f, 0.92845563070029180f, 0.93479780902379184f, 0.94086714381997805f, 0.94665944059061280f, 0.95217069629756890f, 0.95739710212931617f,
		0.96233504613317988f, 0.96698111571154954f, 0.97133209998031445f, 0.97538499198789563f, 0.97913699079334116f, 0.98258550340204664f, 0.98572814655776630f, 0.98856274838967395f,
		0.99108734991333569f, 0.99330020638455863f, 0.99519978850517732f, 0.99678478347994692f, 0.99805409592381300f, 0.99900684861892730f, 0.99964238312089115f, 0.99996026021380402f
		};

lib_com/ivas_rom_com.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -359,7 +359,7 @@ extern const int16_t ivas_lfe_min_shift_tbl[IVAS_LFE_NUM_COEFFS_IN_SUBGRP];
		extern const ivas_lfe_freq_models ivas_str_lfe_freq_models;
		extern const float ivas_lfe_lpf_delay[2];

		extern const float d_hamm_lfe_plc[LFE_PLC_LENANA / 2];
		extern const float hamm_lfe_plc[LFE_PLC_LENANA / 2];

		extern const float ivas_sin_twiddle_480[IVAS_480_PT_LEN >> 1];
		extern const float ivas_cos_twiddle_480[IVAS_480_PT_LEN >> 1];

lib_dec/ivas_lfe_plc.c

+11 −12

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@
		---------------------------------------------------------------------/

		/! r: energy of prediction error /
		static int16_t d_lev_dur(
		static int16_t lfeplc_lev_dur(
		float a_out, / o : LP coefficients (a[0] = 1.0) */
		const float r, / i : vector of autocorrelations */
		const int16_t m, /* i : order of LP filter */
		@@ -116,7 +116,7 @@ static int16_t d_lev_dur(
		}
		else
		{
		for (j = 0; j < i; j++)
		for (j = 0; j <= m; j++)
		{
		a_out[j] = a[j];
		}
		@@ -153,7 +153,7 @@ static int16_t d_lev_dur(
		* Convert from LPC to reflection coeff
		-------------------------------------------------------------------/

		static uint16_t d_a2rc(
		static uint16_t lfeplc_a2rc(
		const float a, / i : LPC coefficients */
		float refl, / o : Reflection co-efficients */
		const int16_t lpcorder /* i : LPC order */
		@@ -225,7 +225,7 @@ static uint16_t check_stab(
		amod[i] = a[i] * fac;
		fac *= fac1;
		}
		stable = d_a2rc( amod, refl, LFE_PLC_LPCORD );
		stable = lfeplc_a2rc( amod, refl, LFE_PLC_LPCORD );

		return stable;
		}
		@@ -317,19 +317,18 @@ static void recover_samples(
		int16_t i;
		float zeroes[LFE_PLC_RECLEN];
		float delta, fac, att;
		float d_outbuf[LFE_PLC_BUFLEN], d_r[LFE_PLC_LPCORD + 1], d_a[LFE_PLC_LPCORD + 1] = {0.f}, d_pee[LFE_PLC_LPCORD + 1] = {0.f};
		float r[LFE_PLC_LPCORD + 1], a[LFE_PLC_LPCORD + 1], pee[LFE_PLC_LPCORD + 1];

		mvr2r( outbuf, d_outbuf, LFE_PLC_BUFLEN );
		autocorr( d_outbuf, d_r, LFE_PLC_LPCORD, LFE_PLC_BUFLEN, d_hamm_lfe_plc, 0, 1, 1 );
		autocorr(outbuf, r, LFE_PLC_LPCORD, LFE_PLC_BUFLEN, hamm_lfe_plc, 0, 1, 1 );

		if ( d_r[0] < POW_THR * LFE_PLC_BUFLEN )
		if ( r[0] < POW_THR * LFE_PLC_BUFLEN )
		{
		set_zero( rec_frame, LFE_PLC_RECLEN );
		return;
		}
		d_lev_dur( d_a, d_r, LFE_PLC_LPCORD, d_pee );
		lfeplc_lev_dur( a, r, LFE_PLC_LPCORD, pee );

		delta = find_max_delta( d_a + 1 );
		delta = find_max_delta( a + 1 );

		fac = 1.0f + delta;
		att = 1.0f;
		@@ -342,12 +341,12 @@ static void recover_samples(

		for ( i = 1; i <= LFE_PLC_LPCORD; i++ )
		{
		d_a[i] = d_a[i] * fac;
		a[i] = a[i] * fac;
		fac = att ( 1.0f + delta );
		}

		set_zero( zeroes, LFE_PLC_RECLEN );
		syn_filt( d_a, LFE_PLC_LPCORD, zeroes, rec_frame, LFE_PLC_RECLEN, outbuf + LFE_PLC_BUFLEN - LFE_PLC_LPCORD, 0 );
		syn_filt( a, LFE_PLC_LPCORD, zeroes, rec_frame, LFE_PLC_RECLEN, outbuf + LFE_PLC_BUFLEN - LFE_PLC_LPCORD, 0 );

		return;
		}