Commit de0de62a authored by sekine's avatar sekine
Browse files

Merge branch 'main' into NTT/REDUC_COMP_POC_202209

parents 2677f1f6 f5e913a8

apps/renderer.c

+3 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
*******************************************************************************************************/



#include "options.h"

#include "debug.h"

#include "audio_file_reader.h"

#include "audio_file_writer.h"

#include "cmdl_tools.h"
@@ -49,6 +48,9 @@ 
#include "PROM_Size_lib_rend.h"

#include "wmops.h"

#endif

#ifdef DEBUGGING

#include "debug.h"

#endif

#ifdef RAM_COUNTING_TOOL

#include "mem_count.h"

#endif

lib_com/ivas_prot.h

+3 −0
Original line number Diff line number Diff line
@@ -205,6 +205,9 @@ ivas_error pre_proc_front_ivas( 
    const int16_t front_vad_flag,                               /* i  : front-VAD flag to overwrite VAD decision   */

    const int16_t force_front_vad,                              /* i  : flag to force VAD decision                 */

    const int16_t front_vad_dtx_flag                            /* i  : front-VAD DTX flag to overwrite VAD decision*/

#ifdef FIX_DTX_RANGE

   ,const int32_t ivas_total_brate                             /* i  : IVAS total bitrate                       */

#endif

);



ivas_error pre_proc_ivas(

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -167,6 +167,9 @@ 
#ifdef FIX_185_REDUCE_MD_BITS

#define CLEANUP_185_NO_AGC_EXCEPTION                    /* Issue 185: Cleanup AGC EXCEPTION code */

#endif

#define FIX_I220_PARAMMC_CPROTO                         /* Issue 220: sanitizer error in the svd due to NaNs coming from negative energies in Cproto */

#define FIX_221_BR_SWITCH_STEREO                        /* Issue 221: Fix missing initialization when switchin from TD to MDCT stereo*/

#define FIX_DTX_RANGE                                   /* Issue 118: fix the DTX usage: default DTX up to 64 kbps, otherwise only in silence */



/* NTT switches */

#define NTT_REDUC_COMP_POC                            /* Contribution  : Complexity reduction of phase spectrum in stereo downmix*/

lib_com/prot.h

+4 −1
Original line number Diff line number Diff line
@@ -3890,6 +3890,9 @@ void td_cng_enc_init( 


void dtx(

    Encoder_State *st, /* i/o: encoder state structure                     */

#ifdef FIX_DTX_RANGE

    const int32_t ivas_total_brate, /* i  : IVAS total bitrate                */

#endif

    const int16_t vad,   /* i  : VAD flag for DTX                            */

    const float speech[] /* i  : Pointer to the speech frame                 */

);

lib_dec/ivas_mc_param_dec.c

+10 −0
Original line number Diff line number Diff line
@@ -1564,6 +1564,16 @@ static void ivas_param_mc_get_mixing_matrices( 


        matrix_product( mat_mult_buffer1, nY_intern, nX, 0, hParamMC->proto_matrix_int, nY_intern, nX, 1, Cproto );



#ifdef FIX_I220_PARAMMC_CPROTO

        for ( ch_idx1 = 0; ch_idx1 < nY_intern; ch_idx1++ )

        {

            if ( Cproto[ch_idx1 + ch_idx1 * nY_intern] < 0.0f )

            {

                Cproto[ch_idx1 + ch_idx1 * nY_intern] = 0.0f;

            }

        }

#endif



        ivas_param_mc_dequantize_cov( hParamMC,

                                      hParamMC->icld_q + param_band_idx * hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe,

                                      hParamMC->icc_q + param_band_idx * hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe,