Commit 763c659f authored by vaclav's avatar vaclav
Browse files

issue 1220: fix bug in renderer flush in OMASA 1ISM JBM bitrate switching;... 

issue 1220: fix bug in renderer flush in OMASA 1ISM JBM bitrate switching; under NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH
parent 7ab76d69

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ 
#define FIX_1206_ZERO_OUT_IMDCT_BUFFERS_FOR_MCT_IGNORE  /* FhG: zero out all relevant imdct buffers in MCT decoding of channels with mct_chan_mode == MCT_CHAN_MODE_IGNORE */

#define NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH             /* VA: issue 1199: fix bug in renderer flush in OMASA JBM bitrate switching */

#define NONBE_1200_ISM_JBM_BRATE_SW_FLUSH               /* VA: issue 1200: fix bug in renderer flush in ISM JBM bitrate switching */



#define NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH             /* VA: issue 1220: fix bug in renderer flush in OMASA 1ISM JBM bitrate switching */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_objectRenderer_internal.c

+5 −1
Original line number Diff line number Diff line
@@ -101,11 +101,15 @@ ivas_error ivas_td_binaural_renderer_sf( 
    int16_t nchan_ism_internal, nchan_ism, ch_offset;



    /* Set the number of ISMs */

#ifdef NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH

    if ( st_ivas->ivas_format == MASA_ISM_FORMAT || ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->nchan_ism > 0 ) )

#else

    if ( st_ivas->ivas_format == MASA_ISM_FORMAT )

#endif

    {

        nchan_ism_internal = st_ivas->nchan_ism;

        nchan_ism = st_ivas->nchan_ism;

        ch_offset = 2;

        ch_offset = CPE_CHANNELS;

    }

    else if ( st_ivas->ivas_format == SBA_ISM_FORMAT )

    {