Commit 65ef6383 authored by Arash Azizi's avatar Arash Azizi
Browse files

issue: 2435 changing argument 4 from st to st->hBstr across instances.

parent 817daa1c

lib_enc/enc_prm_fx.c

+13 −2
Original line number Diff line number Diff line
@@ -745,7 +745,13 @@ void enc_prm_fx( 


        IF( st->hTcxCfg->fIsTNSAllowed )

        {   

#ifndef HARMONIZE_ISSUE_2435_WRITETNSDATA



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

#else

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

#endif // !HARMONIZE_ISSUE_2435_WRITETNSDATA



            j = add( j, nTnsParams ); /* Q0 */

        }
@@ -895,8 +901,13 @@ void enc_prm_fx( 
            {



                SetTnsConfig( st->hTcxCfg, 0, ( last_core == ACELP_CORE ) && ( k == 0 ) );



#ifndef HARMONIZE_ISSUE_2435_WRITETNSDATA

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

#else

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

#endif // !HARMONIZE_ISSUE_2435_WRITETNSDATA



                

                j = add( j, nTnsParams );

            }

lib_enc/prot_fx_enc.h

+9 −2
Original line number Diff line number Diff line
@@ -1494,15 +1494,22 @@ Word16 EncodeTnsData_fx( 
    Word16 *pnSize,

    Word16 *pnBits );





#ifdef HARMONIZE_ISSUE_2435_WRITETNSDATA

Word16 WriteTnsData_fx(

    STnsConfig const* pTnsConfig,

    Word16 const* stream,

    Word16* pnSize,

    Encoder_State *st,

    BSTR_ENC_HANDLE hBstr,

    Word16* pnBits);

#endif // HARMONIZE_ISSUE_2435_WRITETNSDATA



#ifndef HARMONIZE_ISSUE_2435_WRITETNSDATA

Word16 WriteTnsData_fx(

    STnsConfig const *pTnsConfig,

    Word16 const *stream,

    Word16 *pnSize,

    Encoder_State *st,

    Word16 *pnBits );

Word16 WriteTnsData_ivas_fx(

    STnsConfig const *pTnsConfig,

    Word16 const *stream,