Commit f1601877 authored by bayers's avatar bayers
Browse files

#fix for #1003, fix ParamISM USAN problem for binaural output by fixing the TC... 

#fix for #1003, fix ParamISM USAN problem for binaural output by fixing the TC Buffer reconfiguration on a rate switch for ParamISM and binaural output
parent 66e8f1ba

lib_com/options.h

+1 −2
Original line number Diff line number Diff line
@@ -154,8 +154,7 @@ 
/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI          /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */





#define FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN        /* FhG: fix for #1003: fix USAN caused by ParamISM reconfig                    */





/* #################### End BE 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 ) )

        {