Commit 3b8868f2 authored by multrus's avatar multrus
Browse files

Merge branch 'basop-2262-fd-cng-buffer-is-not-updated' into 'main' 

[non-BE] Resolve "FD CNG buffer is not updated"

Closes #2262

See merge request !2848
parents 83f8dfb0 cbe01d6e

lib_com/fd_cng_com_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -166,7 +166,9 @@ void initFdCngCom( 


    set16_fx( hFdCngCom->coherence_fx, 16384 /* 0.5 in Q15 */, MDCT_ST_DTX_NUM_COHERENCE_BANDS );



#ifndef FIX_BASOP_2262_OLAP_BUFFER_SYNTH_SWITCHING

    set32_fx( hFdCngCom->olapBufferSynth_fx, 0, FFTLEN );

#endif

    set32_fx( hFdCngCom->olapBufferSynth2_fx, 0, FFTLEN );

    set32_fx( hFdCngCom->exc_cng_32fx, 0, L_FRAME16k );

    set16_fx( hFdCngCom->exc_cng, 0, L_FRAME16k );

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ 


#define FIX_2448_RENDERER_MSAN_ERROR                    /* FhG: basop issue 2448: fix MSAN error with MSA rendering */

#define FIX_2283_ISM_MD_DELAY                           /* Dolby: Fix ISM metadata delay round-off */

#define FIX_BASOP_2262_OLAP_BUFFER_SYNTH_SWITCHING      /* FhG: basop issue 2262: correct buffer update for FD-CNG buffer in case of BR switching */



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

lib_com/prot_fx.h

+2 −0
Original line number Diff line number Diff line
@@ -7214,7 +7214,9 @@ ivas_error core_switching_pre_dec_fx( 
    const Word16 last_element_mode,   /* i  : last_element_mode            */

    const Word32 last_element_brate,  /* i  : last element bitrate         */

    const Word16 Q_old_synthFB,

#ifndef FIX_BASOP_2262_OLAP_BUFFER_SYNTH_SWITCHING

    Word16 *Q_olapBufferSynth,

#endif

    Word16 *Q_olapBufferSynth2 );



ivas_error core_switching_post_dec_fx(

lib_com/stat_com.h

+4 −2
Original line number Diff line number Diff line
@@ -367,7 +367,9 @@ typedef struct 
    Word16 fftlenFac;    // Q0



    Word16 timeDomainBuffer[L_FRAME16k]; /*Q15*/

#ifndef FIX_BASOP_2262_OLAP_BUFFER_SYNTH_SWITCHING

    Word32 olapBufferSynth_fx[FFTLEN]; /*Q_olapBufferSynth*/

#endif

    Word32 olapBufferSynth2_fx[FFTLEN]; /*Q_olapBufferSynth2*/



    const Word32 *olapWinAna_fx; /* Q30 */

lib_dec/amr_wb_dec_fx.c

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



    /* Updates in case of EVS -> AMR-WB IO switching */

#ifdef FIX_BASOP_2262_OLAP_BUFFER_SYNTH_SWITCHING

    IF( NE_32( ( error = core_switching_pre_dec_fx( st_fx, output_frame, -1, 1, EVS_MONO, EVS_MONO, -1, &tmp16 ) ), IVAS_ERR_OK ) )

#else

    IF( NE_32( ( error = core_switching_pre_dec_fx( st_fx, output_frame, -1, 1, EVS_MONO, EVS_MONO, -1, &tmp16, &tmp16 ) ), IVAS_ERR_OK ) )

#endif

    {

        return error;

    }