Commit f51f2c58 authored by multrus's avatar multrus
Browse files

Merge branch 'basop-2502-harmonize-generate_comfort_noise_dec_' into 'main' 

Resolve "Harmonize generate_comfort_noise_dec_*()"

Closes #2502

See merge request !2920
parents 1f18fedc 8c72a737

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ 
#define FIX_1990_SANITIZER_IN_REVERB_LOAD               /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure - keep until #2059 is addressed */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define HARMONIZE_2502_GENERATE_COMFORT_NOISE_DEC       /* FhG: harmonize generate_comfort_noise_dec_fx() and generate_comfort_noise_dec_ivas_fx() */



/* #################### End BE switches ################################## */

lib_com/prot_fx.h

+2 −0
Original line number Diff line number Diff line
@@ -6433,6 +6433,7 @@ void generate_comfort_noise_dec_fx( 
    const Word16 nchan_out /* i  : number of output channels     */

);



#ifndef HARMONIZE_2502_GENERATE_COMFORT_NOISE_DEC

void generate_comfort_noise_dec_ivas_fx(

    Word32 **bufferReal, /* o   : matrix to real part of i   bands */

    Word32 **bufferImag, /* o   : matrix to imaginary part of i   bands */
@@ -6442,6 +6443,7 @@ void generate_comfort_noise_dec_ivas_fx( 
    Word16 gen_exc,

    const Word16 nchan_out /* i  : number of output channels     */

);

#endif





void generate_comfort_noise_dec_hf_fx(

lib_dec/acelp_core_dec_fx.c

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

                ELSE

                {

#ifdef HARMONIZE_2502_GENERATE_COMFORT_NOISE_DEC

                    generate_comfort_noise_dec_fx( NULL, NULL, NULL, st, &( st->Q_exc ), 1, nchan_out );

#else

                    generate_comfort_noise_dec_ivas_fx( NULL, NULL, NULL, st, &( st->Q_exc ), 1, nchan_out );

#endif

                }



                FdCng_exc( st->hFdCngDec->hFdCngCom, &st->CNG_mode, st->L_frame, st->lsp_old_fx, st->first_CNG, st->lspCNG_fx, Aq_fx, lsp_new_fx, lsf_new_fx, exc_fx, exc2_fx, bwe_exc_fx );

lib_dec/fd_cng_dec_fx.c

+772 −0

File changed.

Preview size limit exceeded, changes collapsed.