Commit e21d3a20 authored by vaclav's avatar vaclav
Browse files

updt

parent 94edac5f

lib_enc/init_enc_fx.c

+7 −2
Original line number Diff line number Diff line
@@ -842,8 +842,9 @@ ivas_error init_encoder_fx( 
            {

                return error;

            }



#ifndef HARMONIZE_TBE

            InitSWBencBuffer_fx( st->hBWE_TD );

#endif

        }

        ELSE

        {
@@ -851,9 +852,13 @@ ivas_error init_encoder_fx( 
            {

                return error;

            }



#ifndef HARMONIZE_TBE

            InitSWBencBuffer_ivas_fx( st->hBWE_TD );

#endif

        }

#ifdef HARMONIZE_TBE

        InitSWBencBuffer_fx( st->hBWE_TD );

#endif

        ResetSHBbuffer_Enc_fx( st->hBWE_TD );

    }

    ELSE

lib_enc/ivas_stereo_switching_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -434,7 +434,11 @@ ivas_error stereo_memory_enc_fx( 
                    }

                }



#ifdef HARMONIZE_TBE

                InitSWBencBuffer_fx( st->hBWE_TD );

#else

                InitSWBencBuffer_ivas_fx( st->hBWE_TD );

#endif

                ResetSHBbuffer_Enc_fx( st->hBWE_TD );



                IF( ( st->hBWE_FD = (FD_BWE_ENC_HANDLE) malloc( sizeof( FD_BWE_ENC_DATA ) ) ) == NULL )

lib_enc/ivas_stereo_td_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -325,7 +325,11 @@ ivas_error stereo_set_tdm_fx( 
                    return error;

                }



#ifdef HARMONIZE_TBE

                InitSWBencBuffer_fx( st->hBWE_TD );

#else

                InitSWBencBuffer_ivas_fx( st->hBWE_TD );

#endif

                ResetSHBbuffer_Enc_fx( st->hBWE_TD );



                IF( ( st->hBWE_FD = (FD_BWE_ENC_HANDLE) malloc( sizeof( FD_BWE_ENC_DATA ) ) ) == NULL )

lib_enc/prot_fx_enc.h

+2 −1
Original line number Diff line number Diff line
@@ -3972,10 +3972,11 @@ void InitSWBencBuffer_fx( 
    TD_BWE_ENC_HANDLE hBWE_TD /* i/o: TD BWE data handle  */

);



#ifndef HARMONIZE_TBE

void InitSWBencBuffer_ivas_fx(

    TD_BWE_ENC_HANDLE hBWE_TD /* i/o: TD BWE data handle  */

);



#endif

void ResetSHBbuffer_Enc_fx(

    TD_BWE_ENC_HANDLE hBWE_TD /* i/o: TD BWE data handle  */

);

lib_enc/swb_tbe_enc_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -413,6 +413,7 @@ static void rescale_genWB_mem_enc( 
void InitSWBencBuffer_fx(

    TD_BWE_ENC_HANDLE hBWE_TD /* i/o: TD BWE data handle  */

)

#ifndef HARMONIZE_TBE

{

    Word16 i;
@@ -510,6 +511,7 @@ void InitSWBencBuffer_fx( 
void InitSWBencBuffer_ivas_fx(

    TD_BWE_ENC_HANDLE hBWE_TD /* i/o: TD BWE data handle  */

)

#endif

{

    Word16 i;