Commit 6db41064 authored by vaclav's avatar vaclav
Browse files

Merge branch '1557_basop_PortFlpMR1394' into 'main-pc' 

Port float MR1394 to main-pc

See merge request !1535
parents 26e87d1f 38026e51

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ 
#define NONBE_FIX_986_MC_BW_SWITCHING                   /* FhG: fix crash in bw and br switching with MC */

#define NONBE_FIX_975_JBM_USAN                          /* FhG: Fix issue #975, USAN in JBM decoding ad 13.2kbps */

#define FIX_699_FILE_READER_JBM_TSM                     /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */

#define FIX_997_REMOVE_SPAR_DEC_UPMIXER                 /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */



#define NONBE_FIX_947_STEREO_DMX_EVS_POC                      /* Orange: Fix clicks on POC */

#ifdef NONBE_FIX_947_STEREO_DMX_EVS_POC

lib_dec/ivas_spar_decoder_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -1534,12 +1534,20 @@ void ivas_spar_dec_set_render_map_fx( 
    return;

}



#ifdef FIX_997_REMOVE_SPAR_DEC_UPMIXER



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

 * ivas_spar_dec_set_render_params()

 *

 * IVAS SPAR set rendering parameters

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

#else

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

 * ivas_spar_dec_upmixer()

 *

 * IVAS SPAR upmixer

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

#endif



void ivas_spar_dec_set_render_params_fx(

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