Commit 52c1b637 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'fhg/mdct-stereo-comfort-noise-fix' into 'main' 

[non-BE] fix for suboptimal spatial CNG in MDCT-Stereo DTX

See merge request !2302
parents 5b33b16e 4dad592a

lib_com/bitstream.c

+2 −1
Original line number Diff line number Diff line
@@ -5409,7 +5409,7 @@ void evs_dec_previewFrame( 


    return;

}



#ifndef NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG



void dtx_read_padding_bits(

    DEC_CORE_HANDLE st,
@@ -5425,3 +5425,4 @@ void dtx_read_padding_bits( 


    return;

}

#endif

lib_com/fd_cng_com.c

+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0

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



#include "ivas_cnst.h"

#include <assert.h>

#include <stdint.h>

#include "options.h"
@@ -140,7 +141,11 @@ void initFdCngCom( 
    hFdCngCom->msMinBufferPtr = 0;

    set_f( hFdCngCom->msAlphaCor, 0.3f, 2 );



#ifdef NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG

    set_f( hFdCngCom->coherence, 0.5f, MDCT_ST_DTX_NUM_COHERENCE_BANDS );

#else

    hFdCngCom->coherence = 0.5f;

#endif



    return;

}

lib_com/ivas_cnst.h

+5 −0
Original line number Diff line number Diff line
@@ -850,6 +850,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.h

+2 −0
Original line number Diff line number Diff line
@@ -793,12 +793,14 @@ Word16 matrix_product_q30_fx( 
    Word32 *Z_fx          /* o  : resulting matrix after the matrix multiplication                                       Q30*/

);



#ifndef NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG



void dtx_read_padding_bits(

    DEC_CORE_HANDLE st,

    const int16_t num_bits 

);



#endif

void ivas_apply_non_diegetic_panning( 

    float *input_f,                                             /* i  : non-diegetic object                                         */

    float *output_f[],                                          /* o  : core-coder transport mono channel/stereo output             */

lib_com/ivas_rom_com.c

+6 −0
Original line number Diff line number Diff line
@@ -793,6 +793,12 @@ const float nf_tw_smoothing_coeffs[N_LTP_GAIN_MEMS] = 
    0.4f,0.2f,0.2f,0.2f

};













#ifdef NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG













const int16_t mdct_stereo_dtx_coherence_bandlengths[MDCT_ST_DTX_NUM_COHERENCE_BANDS] = {













    6, /* 8 - MDCT_ST_DTX_FIRST_BAND_OFFSET */ 8, 16, 16, 80













};













#endif









































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















 * Stereo DTX tables