Commit 7d185c8d authored by bayers's avatar bayers
Browse files

fix for #982, fix asan, add missing condition to copy discrete objects to the... 

fix for #982, fix asan, add missing condition to copy discrete objects to the intermediate buffer only in the common memory, i.e. non-TMS, case
parent f9a67b94

lib_dec/ivas_omasa_dec.c

+14 −9
Original line number Diff line number Diff line
@@ -594,6 +594,8 @@ void ivas_omasa_dirac_rend_jbm( 
    float data_separated_objects[MAX_NUM_OBJECTS][L_FRAME48k];



#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS

    if ( st_ivas->hDecoderConfig->Opt_tsm )

    {

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

#endif
@@ -616,6 +618,9 @@ void ivas_omasa_dirac_rend_jbm( 
#endif

            }

        }

#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS

    }

#endif



    subframes_rendered = st_ivas->hSpatParamRendCom->subframes_rendered;

    slots_rendered = st_ivas->hSpatParamRendCom->slots_rendered;