Commit 54b325a9 authored by Arash Azizi's avatar Arash Azizi
Browse files

issue: 2435 changes required for harmonization: removing function... 

issue: 2435 changes required for harmonization: removing function writetnsdata_fx() and renaming writetnsdata_ivas_fx() definition and instances
parent ac900052

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +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()*/



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

lib_enc/enc_prm_fx.c

+6 −2
Original line number Diff line number Diff line
@@ -1204,7 +1204,11 @@ void writeTCXparam_fx( 
                }

                ELSE

                {   

#ifndef HARMONIZE_ISSUE_2435_WRITETNSDATA

                    WriteTnsData_ivas_fx(st->hTcxCfg->pCurrentTnsConfig, prm + j, &nTnsParams, hBstr, &nTnsBits);

#else

                    WriteTnsData_fx(st->hTcxCfg->pCurrentTnsConfig, prm + j, &nTnsParams, hBstr, &nTnsBits);

#endif // !HARMONIZE_ISSUE_2435_WRITETNSDATA

                }

                IF( no_param_tns )

                {

lib_enc/prot_fx_enc.h

+2 −0
Original line number Diff line number Diff line
@@ -1494,12 +1494,14 @@ Word16 EncodeTnsData_fx( 
    Word16 *pnSize,

    Word16 *pnBits );



#ifndef HARMONIZE_ISSUE_2435_WRITETNSDATA

Word16 WriteTnsData_fx(

    STnsConfig const *pTnsConfig,

    Word16 const *stream,

    Word16 *pnSize,

    Encoder_State *st,

    Word16 *pnBits );

#endif // !HARMONIZE_ISSUE_2435_WRITETNSDATA



Word16 WriteTnsData_ivas_fx(

    STnsConfig const *pTnsConfig,

lib_enc/tns_base_enc_fx.c

+8 −2
Original line number Diff line number Diff line
@@ -770,7 +770,7 @@ void EncodeTnsData_ivas_fx( 


    return;

}



#ifndef HARMONIZE_ISSUE_2435_WRITETNSDATA

Word16 WriteTnsData_fx( STnsConfig const *pTnsConfig, Word16 const *stream, Word16 *pnSize, Encoder_State *st, Word16 *pnBits )

{
@@ -794,7 +794,13 @@ Word16 WriteTnsData_fx( STnsConfig const *pTnsConfig, Word16 const *stream, Word 


    return TNS_NO_ERROR;

}

#endif // !HARMONIZE_ISSUE_2435_WRITETNSDATA



#ifndef HARMONIZE_ISSUE_2435_WRITETNSDATA

Word16 WriteTnsData_ivas_fx(STnsConfig const* pTnsConfig, Word16 const* stream, Word16* pnSize, BSTR_ENC_HANDLE hBstr, Word16* pnBits)

#else

Word16 WriteTnsData_fx(STnsConfig const* pTnsConfig, Word16 const* stream, Word16* pnSize, BSTR_ENC_HANDLE hBstr, Word16* pnBits)

#endif // !HARMONIZE_ISSUE_2435_WRITETNSDATA

{

    IF( GT_16( pTnsConfig->nMaxFilters, 1 ) )

    {