Commit 130a35c4 authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' into 223-return-data-type-in-get_delay

parents 9646fce9 f9075692

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

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ 
#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 */

#define FIX_GET_DELAY_RETURN                            /* Issue 223: change return data type in function get_delay() */

lib_com/prot.h

+4 −1
Original line number Diff line number Diff line
@@ -3894,6 +3894,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_enc/amr_wb_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -311,7 +311,11 @@ void amr_wb_enc( 
        st->fd_cng_reset_flag = 0;

    }



#ifdef FIX_DTX_RANGE

    dtx( st, -1, vad_flag_dtx, inp );

#else

    dtx( st, vad_flag_dtx, inp );

#endif



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

     * Noise energy down-ward update and total noise energy estimation