Commit f9a67b94 authored by bayers's avatar bayers
Browse files

fix for #982, fix remaining asans, move used the wrong number of samples

parent 8b9beb24

lib_dec/ivas_omasa_dec.c

+6 −2
Original line number Diff line number Diff line
@@ -593,10 +593,14 @@ void ivas_omasa_dirac_rend_jbm( 
    int16_t n;

    float data_separated_objects[MAX_NUM_OBJECTS][L_FRAME48k];



#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS

    *nSamplesRendered = min( nSamplesAsked, st_ivas->hTcBuffer->n_samples_available );

#endif



    if ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )

    {

#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS

        mvr2r( &output_f[CPE_CHANNELS][st_ivas->hTcBuffer->n_samples_rendered], data_separated_objects[0], nSamplesAsked );

        mvr2r( &output_f[CPE_CHANNELS][st_ivas->hTcBuffer->n_samples_rendered], data_separated_objects[0], *nSamplesRendered );

#else

        mvr2r( output_f[CPE_CHANNELS], data_separated_objects[0], nSamplesAsked );

#endif
@@ -606,7 +610,7 @@ void ivas_omasa_dirac_rend_jbm( 
        for ( n = 0; n < st_ivas->nchan_ism; n++ )

        {

#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS

            mvr2r( &output_f[n + CPE_CHANNELS][st_ivas->hTcBuffer->n_samples_rendered], data_separated_objects[n], nSamplesAsked );

            mvr2r( &output_f[n + CPE_CHANNELS][st_ivas->hTcBuffer->n_samples_rendered], data_separated_objects[n], *nSamplesRendered );

#else

            mvr2r( output_f[n + CPE_CHANNELS], data_separated_objects[n], nSamplesAsked );

#endif