[cleanup] accept HARMONIZE_READ_DECODE_TNS (034ea30e) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,6 @@
		#define HARMONIZE_TBE2 /* VA: basop issue 2399: Remove duplicated code: TBE, step 2 */
		#define HARMONIZE_2427_GETPLC /* FhG: basop issue : 2427 Harmonizing getPLCDecision functions:*/
		#define HARM_FD_BWE /* VA: harmonize core-coder FD BWE function duplications */
		#define HARMONIZE_READ_DECODE_TNS /* FhG basop 2389: Harm between two pairs of functions. */
		#define FIX_FLOAT_1526_DIRAC_MEM_LEAK /* FhG: float issue 1526: potential memory leak in DirAC handles in case of format switching */
		#define FIX_2437_HARMONIZE_ENCODERINDEX /* FhG: basop issue 2437 EncoderIndex_ivas_fx() and EncoderIndex_fx()*/
		#define FIX_2385_GETTCXONLY /* FhG: issue 2385 : harmonizing getTcxonly_ivas_fx() and getTcxonly_ivas_fx() functions */

+0 −5

Original line number	Diff line number	Diff line
		@@ -228,15 +228,10 @@ void SetParameters_fx(
		IF( s_and( param->pSubParamBitMap != NULL, value > 0 ) )
		{
		pTmp = pParameter;
		#ifdef HARMONIZE_READ_DECODE_TNS
		if ( pSubStruct != NULL )
		{
		pTmp = pSubStruct;
		}
		#else
		if ( pSubStruct != NULL )
		pTmp = pSubStruct;
		#endif
		SetParameters( param->pSubParamBitMap, value, pTmp, pStream, pnSize );
		}
		}

+0 −44

Original line number	Diff line number	Diff line
		@@ -8119,7 +8119,6 @@ void tcx_hm_modify_envelope(
		Word32 env[], /* i/o: envelope Q16 */
		Word16 L_frame /* i: number of spectral lines Q0 */
		);
		#ifdef HARMONIZE_READ_DECODE_TNS
		void ReadTnsData_fx(
		STnsConfig const *pTnsConfig,
		Decoder_State *st,
		@@ -8133,34 +8132,6 @@ Word16 DecodeTnsData_fx(
		Word16 pnSize, /Q0*/
		STnsData *pTnsData );

		#else
		Word16 ReadTnsData(
		STnsConfig const *pTnsConfig,
		Decoder_State *st,
		Word16 *pnBits,
		Word16 *stream,
		Word16 *pnSize );

		void ReadTnsData_ivas_fx(
		STnsConfig const *pTnsConfig,
		Decoder_State *st,
		Word16 *pnBits,
		Word16 *stream,
		Word16 *pnSize );

		Word16 DecodeTnsData(
		STnsConfig const *pTnsConfig,
		Word16 const *stream,
		Word16 *pnSize,
		STnsData *pTnsData );

		Word16 DecodeTnsData_ivas_fx(
		STnsConfig const *pTnsConfig,
		Word16 const *stream,
		Word16 *pnSize,
		STnsData *pTnsData );

		#endif
		void GetParameters(
		ParamsBitMap const *paramsBitMap,
		const Word16 nParams,
		@@ -10829,21 +10800,6 @@ void WriteTnsData(
		Word16 pnBits / o : number of written bits */
		);

		#ifndef HARMONIZE_READ_DECODE_TNS
		void ReadTnsData_ivas(
		STnsConfig const *pTnsConfig,
		Decoder_State *st,
		Word16 *pnBits,
		Word16 *stream,
		Word16 *pnSize );

		Word16 DecodeTnsData_ivas(
		STnsConfig const *pTnsConfig,
		const Word16 *stream,
		Word16 *pnSize,
		STnsData *pTnsData );

		#endif // HARMONIZE_READ_DECODE_TNS
		void analysisCldfbEncoder_ivas_fx(
		Encoder_State st, / i/o: encoder state structure */
		Word32 timeIn, /q11*/

+0 −13

Original line number	Diff line number	Diff line
		@@ -394,13 +394,8 @@ void getTCXparam_fx(
		}
		ELSE
		{
		#ifdef HARMONIZE_READ_DECODE_TNS

		ReadTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, st0, &nTnsBits, prm + j, &nTnsParams );
		#else

		ReadTnsData_ivas_fx( st->hTcxCfg->pCurrentTnsConfig, st0, &nTnsBits, prm + j, &nTnsParams );
		#endif // HARMONIZE_READ_DECODE_TNS
		}
		hTcxDec->tnsActive[k] = 0; // Q0
		move16();
		@@ -1357,11 +1352,7 @@ void dec_prm_fx(
		IF( st->hTcxCfg->fIsTNSAllowed )
		{
		SetTnsConfig( st->hTcxCfg, 1, (Word16) EQ_16( st->last_core_from_bs, ACELP_CORE ) );
		#ifdef HARMONIZE_READ_DECODE_TNS
		ReadTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams );
		#else
		ReadTnsData( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams );
		#endif // HARMONIZE_READ_DECODE_TNS

		j = add( j, nTnsParams ); // Q0
		}
		@@ -1685,11 +1676,7 @@ void dec_prm_fx(
		test();
		test();
		SetTnsConfig( st->hTcxCfg, 0, ( st->last_core_from_bs == ACELP_CORE ) && ( k == 0 ) );
		#ifdef HARMONIZE_READ_DECODE_TNS
		ReadTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams );
		#else
		ReadTnsData( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams );
		#endif // DEBUG


		j = add( j, nTnsParams );

+0 −11

Original line number	Diff line number	Diff line
		@@ -297,17 +297,10 @@ void decoder_tcx_fx(
		IF( ( bfi == 0 ) && ( hTcxCfg->fIsTNSAllowed != 0 ) )
		{
		cast16();
		#ifdef HARMONIZE_READ_DECODE_TNS
		fUseTns = (Word8) DecodeTnsData_fx( hTcxCfg->pCurrentTnsConfig,
		prm_tns,
		&tnsSize,
		&tnsData );
		#else
		fUseTns = (Word8) DecodeTnsData( hTcxCfg->pCurrentTnsConfig,
		prm_tns,
		&tnsSize,
		&tnsData );
		#endif // HARMONIZE_READ_DECODE_TNS
		}
		ELSE
		{
		@@ -4206,11 +4199,7 @@ void decoder_tcx_invQ_fx(
		test();
		IF( !bfi && hTcxCfg->fIsTNSAllowed )
		{
		#ifdef HARMONIZE_READ_DECODE_TNS
		*fUseTns = DecodeTnsData_fx( hTcxCfg->pCurrentTnsConfig, prm_tns, &tnsSize, tnsData );
		#else
		*fUseTns = DecodeTnsData_ivas_fx( hTcxCfg->pCurrentTnsConfig, prm_tns, &tnsSize, tnsData );
		#endif // HARMONIZE_READ_DECODE_TNS

		move16();
		}