Commit 53ae5c01 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '000_basop_mdct-stereo-comfort-noise-fix' into 'main' 

[non-BE][allow-regression]Port MR 2302 from float repo

See merge request !2446
parents d04a383b 8afedf98

lib_com/bitstream_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -5235,7 +5235,7 @@ void evs_dec_previewFrame( 
    return;

}





#ifndef NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG

void dtx_read_padding_bits_fx(

    DEC_CORE_HANDLE st,

    const Word16 num_bits )
@@ -5253,3 +5253,4 @@ void dtx_read_padding_bits_fx( 


    return;

}

#endif

lib_com/fd_cng_com_fx.c

+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
    EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0

  ====================================================================================*/



#include "ivas_cnst.h"

#include <assert.h>

#include <stdint.h>

#include "options.h"
@@ -161,8 +162,12 @@ void ivas_initFdCngCom_fx( HANDLE_FD_CNG_COM hFdCngCom, Word16 scale ) 
    hFdCngCom->exp_cldfb_periodog = 0;

    move16();



#ifdef NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG

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

#else

    hFdCngCom->coherence_fx = 16384; /* 0.5 in Q15 */

    move16();

#endif



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

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

lib_com/ivas_cnst.h

+5 −0
Original line number Diff line number Diff line
@@ -889,6 +889,11 @@ enum fea_names 
#define MDCT_ST_PLC_FADEOUT_TO_ZERO_LEN         20

#define MDCT_ST_PLC_FADEOUT_DELAY_4_LSP_FADE    3



#ifdef NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG

#define MDCT_ST_DTX_NUM_COHERENCE_BANDS         5

#define MDCT_ST_DTX_FIRST_BAND_OFFSET           2

#endif



typedef enum {

    NOISE_GEN_MODE_UNDEF = -1,

    EQUAL_CORES = 0,

lib_com/ivas_prot_fx.h

+2 −0
Original line number Diff line number Diff line
@@ -1506,11 +1506,13 @@ ivas_error ivas_dirac_config_fx( 
    void *st_ivas,                                              /* i/o: IVAS encoder/decoder state structure    */

    const Word16 enc_dec                                        /* i  : encoder or decoder flag                 */

);

#ifndef NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG



void dtx_read_padding_bits_fx(

    DEC_CORE_HANDLE st,

    const Word16 num_bits 

);

#endif



void FdCngEncodeMDCTStereoSID_fx(

    CPE_ENC_HANDLE hCPE                                         /* i/o: CPE encoder state structure             */

lib_com/ivas_rom_com.h

+6 −0
Original line number Diff line number Diff line
@@ -133,6 +133,12 @@ extern const SpectrumWarping sw32000Hz[]; /* PsychLPC */ 


extern const MDCTStereoBands_config mdctStereoBands_32000_640[];



#ifdef NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG

extern const Word16 mdct_stereo_dtx_coherence_bandlengths[MDCT_ST_DTX_NUM_COHERENCE_BANDS];

extern const Word16 get_next_index_4_by_15[16];

#endif





/*----------------------------------------------------------------------------------*

 * Stereo DTX ROM tables

 *----------------------------------------------------------------------------------*/