Commit 35a16b12 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch '1625_ref_port_fl1438' into 'float-pc' 

Resolve Port MR 1438 into float-pc

See merge request !1650
parents 81072ab6 08fd44d2

lib_com/ivas_prot.h

+2 −0
Original line number Diff line number Diff line
@@ -3878,11 +3878,13 @@ void ivas_param_mc_dec_render( 
    float *output_f[]                                           /* o  : rendered time signal                                */

);



#ifndef FIX_1023_REMOVE_PARAMMC_DEC

void ivas_param_mc_dec(

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

    float *output_f[]                                           /* i/o: synthesized core-coder transport channels/DirAC output  */

);



#endif

/*! r: number of cldfb synthesis instances */

int16_t param_mc_get_num_cldfb_syntheses( 

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

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ 
//#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */

/* #define NONBE_FIX_991_PARAMBIN_BINARY_HRTF */             /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to actiate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on  )*/

#define FIX_1024_REMOVE_PARAMMC_MIXING_MAT              /* VA: issue 1024: remove unused function ivas_param_mc_get_mono_stereo_mixing_matrices() */

#define FIX_1023_REMOVE_PARAMMC_DEC                     /* VA: issue 1023: remove unused function ivas_param_mc_dec() */



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_mc_param_dec.c

+4 −2
Original line number Diff line number Diff line
@@ -1535,9 +1535,9 @@ void ivas_param_mc_dec_digest_tc( 




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

 * ivas_param_mc_dec()

 * ivas_param_mc_dec_render()

 *

 * Parametric MC decoding process

 * Parametric MC rendering process

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



void ivas_param_mc_dec_render(
@@ -1857,6 +1857,7 @@ void ivas_param_mc_dec_render( 
    return;

}



#ifndef FIX_1023_REMOVE_PARAMMC_DEC



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

 * ivas_param_mc_dec()
@@ -1898,6 +1899,7 @@ void ivas_param_mc_dec( 
    return;

}



#endif



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

 * param_mc_dec_init()