Commit 011ce8e9 authored by vaclav's avatar vaclav
Browse files

make NONBE_1200_ISM_JBM_BRATE_SW_FLUSH dependent on FIX_HRTF_LOAD

parent 8cc73d60

lib_dec/ivas_ism_dec.c

+9 −0
Original line number Diff line number Diff line
@@ -155,10 +155,19 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
#ifdef FIX_HRTF_LOAD

            /* flush already done in IVAS_DEC_ReadFormat() */

#else

#ifdef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH

        /* write back info for correct rendering of the flushable samples */

        int16_t nchan_transport_ref = st_ivas->nchan_transport;

        st_ivas->nchan_transport = nchan_transport_old;



#endif

        if ( ( error = ivas_jbm_dec_flush_renderer( st_ivas, tc_granularity_new, renderer_type_old, intern_config_old, &hIntSetupOld, MC_MODE_NONE, last_ism_mode, nSamplesRendered, pcm_resolution, data ) ) != IVAS_ERR_OK )

        {

            return error;

        }

#ifdef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH

        st_ivas->nchan_transport = nchan_transport_ref;

#endif

#endif

        }

        /* JBM: when granularity goes up set samples to discard at the beginning of the frame */