Commit a8669d58 authored by vaclav's avatar vaclav
Browse files

Merge branch '1580_ref_PortFlpMR1440' into 'float-pc' 

Port float MR1440 to float-pc

See merge request !1541
parents 26c433ca 4238d646

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ 
#define NONBE_FIX_AVG_IAC_CLDFB_REVERB

#endif

#define FIX_993_REMOVE_SBA_GET_ORDER                    /* VA: issue 993: remove unused function ivas_sba_get_order() */

#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 */

#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT

lib_com/prot.h

+2 −1
Original line number Diff line number Diff line
@@ -4789,13 +4789,14 @@ 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

+2 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include "prot.h"

#include "wmc_auto.h"



#ifndef FIX_960_SYN_OUTPUT

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

 * syn_output()

 *
@@ -65,7 +66,7 @@ uint32_t syn_output( 
    /* integer conversion */

    return mvr2s( synth, synth_out, output_frame );

}



#endif



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

 * AGC_dec()