Commit 3aeac74f authored by Nishant S Kulgod's avatar Nishant S Kulgod
Browse files

commit 1

parent 15656fb4

lib_com/basop32.c

+8 −0
Original line number Diff line number Diff line
@@ -3577,12 +3577,20 @@ Word16 div_l( Word32 L_num, Word16 den ) 


    if ( den == (Word16) 0 )

    {

#ifdef IVAS_FLOAT_FIXED

        /* NOTE: This is just for temporary usage for identifying crashes */

        assert( 0 );

#endif // IVAS_FLOAT_FIXED

        /* printf("Division by 0 in div_l, Fatal error in "); printStack(); */

        exit( -1 );

    }



    if ( ( L_num < (Word32) 0 ) || ( den < (Word16) 0 ) )

    {

#ifdef IVAS_FLOAT_FIXED

        /* NOTE: This is just for temporary usage for identifying crashes */

        assert( 0 );

#endif // IVAS_FLOAT_FIXED

        /* printf("Division Error in div_l, Fatal error in "); printStack(); */

        exit( -1 );

    }

lib_com/count.c

+11 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include <string.h>

#include "stl.h"

#include <assert.h>



#ifdef WMOPS

static double frameRate = FRAME_RATE;   /* default value : 10 ms */

#endif /* ifdef WMOPS */
@@ -854,9 +855,11 @@ void generic_WMOPS_output (Word16 dtx_mode, char *test_file_name) { 
/* FROM_EVS_DEV */



#define MAX_STACK       64

#if WMOPS

static int stack[MAX_STACK];

static int sptr;

static int sum_stack[MAX_STACK];

#endif



/* jdr 20120117: add FLC similar functions */

void BASOP_frame_update(void)
@@ -1062,6 +1065,7 @@ void BASOP_push_wmops (const char *label) 
#endif



#endif /* if WMOPS */

  UNUSED_PARAM(label);

}
@@ -1115,7 +1119,9 @@ Word32 BASOP_get_wops (void) 
#define MILLION_CYCLES     1e6

#define FAC               (FRAMES_PER_SECOND/MILLION_CYCLES)



#if WMOPS

static Word32 prom_cnt = 0;

#endif



void WMOPS_destroy(void)

{
@@ -1292,6 +1298,7 @@ void WMOPS_output_all(Word16 dtx_mode) 
  WMOPS_destroy();



#endif /* if WMOPS */

  UNUSED_PARAM(dtx_mode);

}

void WMOPS_output_all_std(Word16 dtx_mode)

{
@@ -1392,6 +1399,7 @@ void WMOPS_output_all_std(Word16 dtx_mode) 
  WMOPS_destroy();



#endif /* if WMOPS */

  UNUSED_PARAM(dtx_mode);

}
@@ -1431,6 +1439,8 @@ void BASOP_get_total_wmops(double *min, double *max, double *avg) 
    *avg = (nbframe[0] == 0) ? 0 : ops_cnt / nbframe[0];

  }

#endif /* if WMOPS */

  UNUSED_PARAM(min);

  UNUSED_PARAM(max);

  UNUSED_PARAM(avg);

}



/* end of file */

lib_com/ivas_prot.h

+1 −1
Original line number Diff line number Diff line
@@ -6723,7 +6723,7 @@ void ivas_ls_setup_conversion_process_mdct( 
void ivas_ls_setup_conversion_process_mdct_param_mc_fx(

    Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure          */

    Word32 *x_fx[][NB_DIV],       /* i/o: Fixed output synthesis signal         */

    Word16 x_e[MAX_CICP_CHANNELS][NB_DIV]/* i/o: Exponent for output synthesis signal */

    Word16 x_e[CPE_CHANNELS][NB_DIV]/* i/o: Exponent for output synthesis signal */

);

#endif // IVAS_FLOAT_FIXED

lib_com/ivas_prot_fx.h

+1 −1
Original line number Diff line number Diff line
@@ -1399,7 +1399,7 @@ void ivas_mdct_core_tns_ns_fx( 
    Word32 *x_fx[CPE_CHANNELS][NB_DIV],                          /* o  : synthesis @internal_FS                 */

    Word32 Aq_fx[CPE_CHANNELS][(NB_SUBFR16k + 1) * (M + 1)], /* o  : LP coefficients                        */

    const Word16 MCT_flag,                                   /* i  : hMCT handle allocated (1) or not (0)   */

    Word16 x_e[MAX_CICP_CHANNELS][NB_DIV]

    Word16 x_e[CPE_CHANNELS][NB_DIV]

);



void decoder_tcx_imdct_fx(

lib_com/lerp.c

+3 −3
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static void lerp_proc_flt( 
  * Local function prototypes

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



static void lerp_proc(Word16 *f, Word16 *f_out, Word16 bufferNewSize, Word16 bufferOldSize);

static void lerp_proc(const Word16 *f, Word16 *f_out, Word16 bufferNewSize, Word16 bufferOldSize);



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

 * procedure lerp()                                            *
@@ -203,7 +203,7 @@ static void lerp_proc(Word16 *f, Word16 *f_out, Word16 bufferNewSize, Word16 buf 
 *                                                             *

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



void lerp(Word16 *f, Word16 *f_out, Word16 bufferNewSize, Word16 bufferOldSize)

void lerp(const Word16 *f, Word16 *f_out, Word16 bufferNewSize, Word16 bufferOldSize)

{

  Word16 tmp1, tmp2, tmpexp;

  BASOP_Util_Divide_MantExp(bufferNewSize, 0, bufferOldSize, 0, &tmp1, &tmpexp);
@@ -267,7 +267,7 @@ void lerp(Word16 *f, Word16 *f_out, Word16 bufferNewSize, Word16 bufferOldSize) 
 *                                                             *

 *                                                             *

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

static void lerp_proc(Word16 *f, Word16 *f_out, Word16 bufferNewSize, Word16 bufferOldSize)

static void lerp_proc(const Word16 *f, Word16 *f_out, Word16 bufferNewSize, Word16 bufferOldSize)

{



  Word16 i, idx, n;