Commit 5ce99876 authored by vaclav's avatar vaclav
Browse files

issue 1244: fix to SWB BWE memory in case of switching from FB coding; under... 

issue 1244: fix to SWB BWE memory in case of switching from FB coding; under NONBE_1244_FIX_SWB_BWE_MEMORY
parent d8ff2d01

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ 
#define NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH             /* VA: issue 1220: fix bug in renderer flush in OMASA 1ISM JBM bitrate switching */

#define NONBE_1229_FIX_ISM1_DPID                        /* Eri: issue 1229: fix bug causing ISM 1 to use default -dpid instead of the specified one */

#define NONBE_1233_HQ_CLASSIFIER_DIV_BY_ZERO            /* Eri: issue 1233: Address possible division by zero in hf_spectrum_sparseness() */

#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding */ 





/* ##################### End NON-BE switches ########################### */

lib_enc/swb_pre_proc.c

+4 −0
Original line number Diff line number Diff line
@@ -442,7 +442,11 @@ void swb_pre_proc( 
                if ( st->last_extl != SWB_BWE && st->last_extl != FB_BWE )

                {

                    /* resample 48 kHz to 32kHz */

#ifdef NONBE_1244_FIX_SWB_BWE_MEMORY

                    if ( ( st->last_bwidth == FB && st->element_mode == EVS_MONO ) || ( st->bwidth == FB && st->element_mode > EVS_MONO ) )

#else

                    if ( st->last_bwidth == FB )

#endif

                    {

                        inner_frame = L_FRAME48k;

                        inner_Fs = 48000;