Commit 584959fd authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept FIX_960_SYN_OUTPUT

parent e8323a44

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ 
#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM

#define NONBE_FIX_AVG_IAC_CLDFB_REVERB

#endif

#define FIX_960_SYN_OUTPUT                              /* VA: issue 960: unused function syn_output() is removed */



#define USE_NEW_HRTF_BINARY_FILE_FORMAT                 /* Orange: to activate when decided to change the hrtf binary file format */

//#define NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES       /* Philips: Use pre-computed HRTF average L/R energies and IAC in all renderers	*/

lib_com/prot.h

+0 −8
Original line number Diff line number Diff line
@@ -4790,14 +4790,6 @@ void dec_acelp_4t64( 
    float code[],            /* o  : algebraic (fixed) codebook excitation           */

    const int16_t Opt_AMR_WB /* i  : flag indicating AMR-WB IO mode                  */

);

#ifndef FIX_960_SYN_OUTPUT

uint32_t syn_output(

    float *synth,               /* i/o: float synthesis signal                          */

    const int16_t output_frame, /* i  : output frame length                             */

    int16_t *synth_out          /* o  : integer 16 bits synthesis signal                */

);



#endif

void FEC_exc_estim(

    Decoder_State *st,     /* i/o: Decoder static memory                           */

    const int16_t L_frame, /* i  : length of the frame                             */

lib_dec/syn_outp.c

+0 −23
Original line number Diff line number Diff line
@@ -44,29 +44,6 @@ 
#include "prot.h"

#include "wmc_auto.h"



#ifndef FIX_960_SYN_OUTPUT

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

 * syn_output()

 *

 * Output synthesis signal with compensation for saturation

 * returns number of clipped samples

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



/*! r: number of clipped samples */

uint32_t syn_output(

    float *synth,               /* i/o: float synthesis signal               */

    const int16_t output_frame, /* i  : output frame length                  */

    int16_t *synth_out          /* o  : integer 16 bits synthesis signal     */

)

{

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

     * float to integer conversion with saturation control

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



    /* integer conversion */

    return mvr2s( synth, synth_out, output_frame );

}

#endif



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

 * AGC_dec()