Commit a2f20d29 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_BASOP_2262_OLAP_BUFFER_SYNTH_SWITCHING

parent 511afb40

lib_com/fd_cng_com_fx.c

+0 −3
Original line number Diff line number Diff line
@@ -166,9 +166,6 @@ 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

#ifndef FIX_BASOP_REMOVE_SYNTH2_FX

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

#endif

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ 
/* any switch which is non-be wrt. TS 26.251 V3.0 */



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

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

#define FIX_2440_AGC_PRESCALING                         /* FhG: basop issue 2440: Fix loop bounds when scaling p_output_fx before ivas_spar_dec_agc_pca_fx() */

#define FIX_2471_REMOVE_POSSIBLE_OVRF                   /* VA: basop issue 2471: correcting undesired overflow */

#define FIX_2465_Q_BWE_EXC                              /* VA: basop issue 2465: fix calculation of Q_bwe_exc in SWB TBE encoder */

lib_com/prot_fx.h

+2 −9
Original line number Diff line number Diff line
@@ -7091,17 +7091,10 @@ ivas_error core_switching_pre_dec_fx( 
    const Word16 nchan_out,           /* i  : number of output channels    */

    const Word16 last_element_mode,   /* i  : last_element_mode            */

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

#if defined( FIX_BASOP_REMOVE_SYNTH2_FX ) && defined( FIX_BASOP_2262_OLAP_BUFFER_SYNTH_SWITCHING )

#if defined( FIX_BASOP_REMOVE_SYNTH2_FX )

    const Word16 Q_old_synthFB );

#elif defined( FIX_BASOP_2262_OLAP_BUFFER_SYNTH_SWITCHING )

    const Word16 Q_old_synthFB,

    Word16 *Q_olapBufferSynth2 );

#elif defined( FIX_BASOP_REMOVE_SYNTH2_FX )

        const Word16 Q_old_synthFB,

        Word16 *Q_olapBufferSynth );

#else

    const Word16 Q_old_synthFB,

        Word16 *Q_olapBufferSynth,

    Word16 *Q_olapBufferSynth2 );

#endif

lib_com/stat_com.h

+0 −3
Original line number Diff line number Diff line
@@ -367,9 +367,6 @@ 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

#ifndef FIX_BASOP_REMOVE_SYNTH2_FX

    Word32 olapBufferSynth2_fx[FFTLEN];

#endif

lib_dec/amr_wb_dec_fx.c

+2 −4
Original line number Diff line number Diff line
@@ -173,12 +173,10 @@ ivas_error amr_wb_dec_fx( 
    }



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

#if defined( FIX_BASOP_REMOVE_SYNTH2_FX ) && defined( FIX_BASOP_2262_OLAP_BUFFER_SYNTH_SWITCHING )

#if defined( FIX_BASOP_REMOVE_SYNTH2_FX )

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

#elif defined( FIX_BASOP_REMOVE_SYNTH2_FX ) || defined( 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 ) )

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

#endif

    {

        return error;