Commit b6c4bac4 authored by multrus's avatar multrus
Browse files

also include EncodeTnsData*_fx()

parent 81c3ca0c

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ 
#define HARM_FD_BWE                                     /* VA: harmonize core-coder FD BWE function duplications */

#define FIX_2411_Harmonize_TNSANALYSIS_DETECTTNSFILT    /* FhG: basop issue 2411: harmonize TNSAnalysis*_fx(), DetectTnsFilt*_fx()*/        

#define HARMONIZE_READ_DECODE_TNS                       /* FhG basop 2389: Harm between two pairs of functions. */

#define HARMONIZE_ISSUE_2435_WRITETNSDATA               /*FhG basop 2435: Harmonize WriteTnsData_ivas_fx(), WriteTnsData_fx()*/

#define HARMONIZE_ISSUE_2435_WRITETNSDATA               /* FhG basop 2435: Harmonize WriteTnsData*_fx(), EncodeTnsData*_fx() */



/* #################### End BE switches ################################## */

lib_com/prot_fx.h

+13 −0
Original line number Diff line number Diff line
@@ -8186,6 +8186,7 @@ void GetParameters_fx( 
    Word16 *pnBits             // Q0

);



#ifndef HARMONIZE_ISSUE_2435_WRITETNSDATA

void EncodeTnsData_ivas_fx(

    STnsConfig const *pTnsConfig, /* i  : TNS Configuration struct          */

    STnsData const *pTnsData,     /* i  : TNS data struct (quantized param) */
@@ -8193,6 +8194,15 @@ void EncodeTnsData_ivas_fx( 
    Word16 *pnSize,               /* o  : number of written parameters      Q0*/

    Word16 *pnBits                /* o  : number of written bits            Q0*/

);

#else

void EncodeTnsData_ivas_fx(

    STnsConfig const *pTnsConfig, /* i  : TNS Configuration struct          */

    STnsData const *pTnsData,     /* i  : TNS data struct (quantized param) */

    Word16 *stream,               /* o  : internal data stream           Q0 */

    Word16 *pnSize,               /* o  : number of written parameters   Q0 */

    Word16 *pnBits                /* o  : number of written bits         Q0 */

);

#endif



void SetParameters(

    ParamsBitMap const *paramsBitMap,
@@ -10805,6 +10815,7 @@ void ResetTnsData_flt( 
void ClearTnsFilterCoefficients_flt(

    STnsFilter *pTnsFilter );



#ifndef HARMONIZE_ISSUE_2435_WRITETNSDATA

void EncodeTnsData(

    STnsConfig const *pTnsConfig, /* i  : TNS Configuration struct          */

    STnsData const *pTnsData,     /* i  : TNS data struct (quantized param) */
@@ -10812,6 +10823,7 @@ void EncodeTnsData( 
    Word16 *pnSize,               /* o  : number of written parameters      */

    Word16 *pnBits                /* o  : number of written bits            */

);

#endif



void WriteTnsData(

    const STnsConfig *pTnsConfig, /* i  : TNS Configuration struct          */
@@ -10820,6 +10832,7 @@ void WriteTnsData( 
    BSTR_ENC_HANDLE hBstr,        /* o  : bitstream                         */

    Word16 *pnBits                /* o  : number of written bits            */

);



#ifndef HARMONIZE_READ_DECODE_TNS

void ReadTnsData_ivas(

    STnsConfig const *pTnsConfig,

lib_enc/cod_tcx_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -5506,7 +5506,11 @@ void TNSAnalysisStereo_fx( 


                st->hTcxEnc->tnsData[k].tnsOnWhitenedSpectra = st->hTcxEnc->bTnsOnWhithenedSpectra[k];

                move16();

#ifdef HARMONIZE_ISSUE_2435_WRITETNSDATA

                EncodeTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, &st->hTcxEnc->tnsData[k], param_core[ch] + k * NPRM_DIV + 1 + NOISE_FILL_RANGES + LTPSIZE, tnsSize[ch] + k, tnsBits[ch] + k );

#else

                EncodeTnsData_ivas_fx( st->hTcxCfg->pCurrentTnsConfig, &st->hTcxEnc->tnsData[k], param_core[ch] + k * NPRM_DIV + 1 + NOISE_FILL_RANGES + LTPSIZE, tnsSize[ch] + k, tnsBits[ch] + k );

#endif

            }



            IF( EQ_16( st->hTcxEnc->transform_type[k], TCX_5 ) )

lib_enc/prot_fx_enc.h

+9 −1
Original line number Diff line number Diff line
@@ -1486,13 +1486,21 @@ Word16 DetectTnsFilt_ivas_fx( 
    Word16 *predictionGain        /* o  : TNS prediction gain        Q=7    */

);





#ifdef HARMONIZE_ISSUE_2435_WRITETNSDATA

void EncodeTnsData_fx(

    STnsConfig const *pTnsConfig,

    STnsData const *pTnsData,

    Word16 *stream,

    Word16 *pnSize,

    Word16 *pnBits );

#else

Word16 EncodeTnsData_fx(

    STnsConfig const *pTnsConfig,

    STnsData const *pTnsData,

    Word16 *stream,

    Word16 *pnSize,

    Word16 *pnBits );

#endif



#ifdef HARMONIZE_ISSUE_2435_WRITETNSDATA

Word16 WriteTnsData_fx(

lib_enc/tns_base_enc_fx.c

+12 −0
Original line number Diff line number Diff line
@@ -697,6 +697,7 @@ Word16 DetectTnsFilt_ivas_fx( 
    return ( pTnsData->nFilters > 0 );

}



#ifndef HARMONIZE_ISSUE_2435_WRITETNSDATA

Word16 EncodeTnsData_fx( STnsConfig const *pTnsConfig, STnsData const *pTnsData, Word16 *stream, Word16 *pnSize, Word16 *pnBits )

{
@@ -724,7 +725,17 @@ Word16 EncodeTnsData_fx( STnsConfig const *pTnsConfig, STnsData const *pTnsData, 


    return TNS_NO_ERROR;

}

#endif



#ifdef HARMONIZE_ISSUE_2435_WRITETNSDATA

void EncodeTnsData_fx(

    STnsConfig const *pTnsConfig, /* i  : TNS Configuration struct          */

    STnsData const *pTnsData,     /* i  : TNS data struct (quantized param) */

    Word16 *stream,               /* o  : internal data stream              Q0*/

    Word16 *pnSize,               /* o  : number of written parameters      Q0*/

    Word16 *pnBits                /* o  : number of written bits            Q0*/

)

#else

void EncodeTnsData_ivas_fx(

    STnsConfig const *pTnsConfig, /* i  : TNS Configuration struct          */

    STnsData const *pTnsData,     /* i  : TNS data struct (quantized param) */
@@ -732,6 +743,7 @@ void EncodeTnsData_ivas_fx( 
    Word16 *pnSize,               /* o  : number of written parameters      Q0*/

    Word16 *pnBits                /* o  : number of written bits            Q0*/

)

#endif

{

    *pnSize = 0;

    move16();