Commit 6fa01c53 authored by Manuel Jander's avatar Manuel Jander
Browse files

Merge remote-tracking branch 'origin' into... 

Merge remote-tracking branch 'origin' into 2206-assert-in-stereo_switching_enc_fx-for-omasa-rate-switching-input-new-stv
parents 7a9a719e 7bf796ef

Makefile

+0 −1
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ LDFLAGS += -g3 
endif



ifeq "$(COVERAGE)" "1"

CC       = gcc

CFLAGS  += -fprofile-arcs -ftest-coverage -fprofile-update=atomic

LDFLAGS += -fprofile-arcs -ftest-coverage -fprofile-update=atomic

endif

lib_com/ivas_prot_fx.h

+10 −1
Original line number Diff line number Diff line
@@ -1691,6 +1691,7 @@ void ivas_mdct_tcx10_bit_distribution_fx( 
    const Word16 nTnsBitsTCX10[NB_DIV]                          /* i  : TNS bits                                */

);



#ifndef FIX_2480_HARM_TONALMDCT

void TonalMDCTConceal_Detect_ivas_fx(

    const TonalMDCTConcealPtr hTonalMDCTConc,

    const Word32 pitchLag,
@@ -1698,7 +1699,15 @@ void TonalMDCTConceal_Detect_ivas_fx( 
    const PsychoacousticParameters *psychParamsCurrent,

    Word16 element_mode 

);



#else

void TonalMDCTConceal_Detect_fx(

    const TonalMDCTConcealPtr hTonalMDCTConc,

    const Word32 pitchLag,

    Word16* numIndices,

    const PsychoacousticParameters* psychParamsCurrent,

    Word16 element_mode

);

#endif // !FIX_2480_HARM_TONALMDCT

ivas_error stereo_dft_dec_create_fx(

    STEREO_DFT_DEC_DATA_HANDLE *hStereoDft,                     /* i/o: decoder DFT stereo handle               */

    const Word32 element_brate,                                 /* i  : element bitrate                         */

lib_com/options.h

+3 −7
Original line number Diff line number Diff line
@@ -88,20 +88,16 @@ 
#define NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT             /* FhG: Dynamic scale of shb_speech buffers */

// #define NONBE_FIX_ISSUE_2206_DO_NOT_FLUSH_TO_ZERO       /* FhG: Do not right shift flush to zero in Copy_Scale_sig_nosat */

#define HARM_HQ_CORE_KEEP_BE                            /* hack to keep all BE after HQ core functions harmonization; pending resolving issues #2450, #2451, #2452 */

#define FIX_BASOP_2457_HARM_GEN                         /* FhG: harmonization of function generate_comfort_noise_dec_hf_ivas_fx()*/

#define FIX_BASOP_2478_HARM_ENC_PRM_HM                  /* FhG: basop issue 2478: harmonize enc_prm_hm() and enc_prm_hm_ivas_fx() */

#define FIX_2455_HARMONIZE_generate_comfort_noise_enc   /* FhG: harmonize generate_comfort_noise_enc and generate_comfort_noise_enc_ivas */

#define FIX_2455_HARMONIZE_configureFdCngEnc            /* FhG: harmonize generate_comfort_noise_enc and generate_comfort_noise_enc_ivas */

#define FIX_2463_EVS_BWE_LSF                            /* VA: basop issue 2463: harmonize calling of Quant_BWE_LSF_fx() */

#define FIX_2452_HQ_CORE_PEAQ_AVR_RATIO_HARM            /* Eri: Basop issue 2453: Fix alignment of peak_avrg_ratio_fx */

#define FIX_2480_HARM_TONALMDCT                         /* FhG: basop issue 2480: Harmonize TonalMDCTConceal_Detect_fx() and TonalMDCTConceal_Detect_ivas_fx() */

#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() */



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



/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt. TS 26.251 V3.0 */



#define FIX_BASOP_2451_HQ_FEC_SELECTOR                  /* Eri: Resolve basop issue 2451, wrong condition on env_stab_plc_fx */

#define FIX_2398_PRECISSION_ORIENTATION_TRACKING        /* FhG: use refinement of Sqrt32 within certain functions*/

#define FIX_BASOP_2486_HQ_FINE_GAIN_ALIGNMENT           /* Eri: Basop issue 2486: IVAS BASOP used calculations with truncation, EVS BASOP used rounding. This aligns the use of a table lookup. */

#define FIX_1543_MID_LSF_BITS                           /* VA: float issue 1543: Resolve "MSAN: use-of-uninitialized-value in lib_enc/lsf_enc.c:262:5 for EVS encoder" */

#define FIX_2488_PREVENT_NEG_PITCH                      /* VA: Fix for 2488, use saturation to prevent possible wrap-around, thus negative pitch values */

lib_com/prot_fx.h

+2 −16
Original line number Diff line number Diff line
@@ -5712,12 +5712,14 @@ void TonalMDCTConceal_UpdateState_fx( 
    const Word16 badBlock,

    const Word8 tonalConcealmentActive );



#ifndef FIX_2480_HARM_TONALMDCT

void TonalMDCTConceal_Detect_fx(

    const TonalMDCTConcealPtr self, /*IN */

    const Word32 pitchLag,          /*IN */

    Word16 *umIndices,              /*OUT*/

    const Word16 element_mode       /* IN */

);

#endif // !FIX_2480_HARM_TONALMDCT



void TonalMDCTConceal_Apply_fx(

    const TonalMDCTConcealPtr hTonalMDCTConc, /*IN */
@@ -6622,15 +6624,6 @@ void generate_comfort_noise_dec_ivas_fx( 
    const Word16 nchan_out /* i  : number of output channels     */

);



#ifndef FIX_BASOP_2457_HARM_GEN

void generate_comfort_noise_dec_hf_ivas_fx(

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

    Word32 **bufferImag,         /* o   : matrix to imaginary part of input bands  bufferScale*/

    Word16 *bufferScale,         /* o   : pointer to scalefactor for real and imaginary part of input bands */

    HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables  */

    const Word16 cng_coh_flag    /* i  : CNG Flag for coherence handling                        Q0*/

);

#endif



void generate_comfort_noise_dec_hf_fx(

    Word32 **bufferReal, /* o   : matrix to real part of input bands   bufferScale*/
@@ -9811,13 +9804,6 @@ void core_coder_mode_switch_ivas_fx( 
    const Word16 MCT_flag          /* i  : hMCT handle allocated (1) or not (0)*/

);



#ifndef FIX_2455_HARMONIZE_configureFdCngEnc

void configureFdCngEnc_ivas_fx(

    HANDLE_FD_CNG_ENC hFdCngEnc, /* i/o: Contains the variables related to the FD-based CNG process */

    const Word16 bwidth,         /* Q0 */

    const Word32 total_brate     /* Q0 */

);

#endif



void SetModeIndex_ivas_fx(

    Encoder_State *st,              /* i  : Encoder state                          */

lib_com/window_ola_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -304,11 +304,7 @@ void window_ola_fx( 
            p4 = oldgapsynth + n;

            FOR( i = 0; i < temp; i++ )

            {

#ifdef FIX_BASOP_2451_HQ_FEC_SELECTOR

                *p1 = add_sat( mult( *p1, *p2 ), mult( *p4, *p3 ) ); /*   auOut[i]*SS2[i]+ oldgapsynth[i+n]*(SS2[L-n-i-1]);*/

#else

                *p1 = add( mult( *p1, *p2 ), mult( *p4, *p3 ) ); /*   auOut[i]*SS2[i]+ oldgapsynth[i+n]*(SS2[L-n-i-1]);*/

#endif

                move16();

                p1++;

                p2++;