Commit 4cac2632 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'main-pc' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into...

Merge branch 'main-pc' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into 1619_basop_port_fl1395
parents e2cf5b32 6db41064
Loading
Loading
Loading
Loading
Loading
+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
+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                     */