Commit dcad5181 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

add harmonized function generate_comfprt-noise_dec - inactive - errors

parent 7897b35e

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ 
#define FIX_2479_HARM_PITCH_GAIN                        /* FhG: basop issue 2479: Harmonize tcx_ltp_pitch_search_*(), tcx_ltp_find_gain_*fx() */

#define HARMONIZE_2481_EXTEND_SHRINK                    /* FhG: basop issue 2481: Harmonize extend_frm_*fx() and shrink_frm_*fx() */

#define FIX_FLOAT_ISSUE_1546_DEAD_CODE                  /* FhG: remove dead code reported in the issue*/

//#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
@@ -6610,6 +6610,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 */
@@ -6619,6 +6620,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
@@ -731,7 +731,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

+769 −0

File changed.

Preview size limit exceeded, changes collapsed.