Commit 825552a1 authored by vaclav's avatar vaclav
Browse files

revert addition of flush ISM samples to the MASA ones

parent ccb72e9e

lib_dec/ivas_jbm_dec.c

+1 −16
Original line number Diff line number Diff line
@@ -1681,9 +1681,6 @@ ivas_error ivas_jbm_dec_flush_renderer( 
            {

#ifdef NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH

                float *tc_local[MAX_NUM_OBJECTS];

                float data_separated_objects[BINAURAL_CHANNELS][L_FRAME48k];

                float *p_sepobj[BINAURAL_CHANNELS];

                int16_t n;

#else

                float *tc_local[MAX_TRANSPORT_CHANNELS];

#endif
@@ -1695,22 +1692,10 @@ ivas_error ivas_jbm_dec_flush_renderer( 
                }



#ifdef NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH

                for ( n = 0; n < BINAURAL_CHANNELS; n++ )

                {

                    p_sepobj[n] = &data_separated_objects[n][0];

                }



                if ( ( error = ivas_td_binaural_renderer_sf( st_ivas, p_sepobj, hTcBuffer->n_samples_granularity ) ) != IVAS_ERR_OK )

                if ( ( error = ivas_td_binaural_renderer_sf( st_ivas, p_output, hTcBuffer->n_samples_granularity ) ) != IVAS_ERR_OK )

                {

                    return error;

                }



#if 0

                for ( n = 0; n < BINAURAL_CHANNELS; n++ )

                {

                    v_add( p_output[n], p_sepobj[n], p_output[n], *nSamplesRendered );

                }

#endif

#else

                if ( st_ivas->nchan_ism > 0 )

                {