Commit 16855ad6 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch '1606_ref_port_fl1402' into 'float-pc' 

Port MR 1402 into float-pc

See merge request !1617
parents 82add814 a50e68d5

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ 
#define NONBE_FIX_1000_G1_G2_SWB_TBE                    /* VA: issue 1000: avoid div by zero due to g1 + g2 being zero in SWB TBE */

#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 FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN        /* FhG: fix for #1003: fix USAN caused by ParamISM reconfig                    */



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

lib_dec/ivas_ism_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -343,11 +343,13 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
        tc_nchan_allocate_new = tc_nchan_tc_new;

        tc_nchan_full_new = tc_nchan_tc_new;



#ifndef FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN

        if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC )

        {

            tc_nchan_allocate_new = 2 * BINAURAL_CHANNELS;

            tc_nchan_full_new = tc_nchan_allocate_new;

        }

#endif



        if ( st_ivas->ism_mode == ISM_MODE_PARAM && ( st_ivas->renderer_type != RENDERER_MONO_DOWNMIX && st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM ) )

        {