Commit d94a298c authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_960_SYN_OUTPUT

parent aca651c8

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



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

#define FIX_1027_GSC_INT_OVERFLOW                       /* VA: issue 2207: overflow in GSC */



/* #################### End BE switches ################################## */

lib_com/prot.h

+0 −8
Original line number Diff line number Diff line
@@ -4824,14 +4824,6 @@ void dec_acelp_4t64( 
    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 −24
Original line number Diff line number Diff line
@@ -45,31 +45,7 @@ 
#include "wmc_auto.h"





#ifdef FIX_960_SYN_OUTPUT

/* Note: syn_output() is replaced by ivas_syn_output() in IVAS */

#else

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

 * 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





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