Commit 2abba0af authored by vaclav's avatar vaclav
Browse files

fixes

parent f3f3e574

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ LDLIBS += -lm 
CCCLANG = clang

ifeq "$(CLANG)" "1"

CC       = $(CCCLANG)

CFLAGS  += -fsanitize=memory

CFLAGS  += -fsanitize=memory -fsanitize-memory-track-origins

LDFLAGS += -fsanitize=memory

endif

ifeq "$(CLANG)" "2"

lib_dec/ivas_dirac_dec.c

+5 −1
Original line number Diff line number Diff line
@@ -1705,6 +1705,7 @@ void ivas_dirac_dec_render( 
    {

#ifdef NONBE_UNIFIED_DECODING_PATHS_FIX

        output_f_local[ch] = output_f_local_buff[ch];

        set_zero( output_f_local_buff[ch], nSamplesAsked );

#else

        output_f_local[ch] = output_f[ch];

#endif
@@ -1743,9 +1744,12 @@ void ivas_dirac_dec_render( 


#ifdef NONBE_UNIFIED_DECODING_PATHS_FIX

    for ( ch = 0; ch < nchan_intern; ch++ )

    {

        if ( !( ( st_ivas->hDirACRend->hOutSetup.separateChannelEnabled ) && ( st_ivas->hDirACRend->hOutSetup.separateChannelIndex == ch || st_ivas->hDirACRend->hOutSetup.separateChannelIndex + 1 == ch ) ) )

        {

            mvr2r( output_f_local_buff[ch], output_f[ch], *nSamplesRendered );

        }

    }



#endif

    if ( hSpatParamRendCom->slots_rendered == hSpatParamRendCom->num_slots )

lib_dec/ivas_ism_renderer.c

+17 −6
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ void ivas_omasa_separate_object_render_jbm( 
    Decoder_Struct *st_ivas,         /* i/o: IVAS decoder structure                      */

    const uint16_t nSamplesRendered, /* i  : number of samples rendered                  */

#ifdef NONBE_UNIFIED_DECODING_PATHS_FIX

    float input_f[][L_FRAME48k], /* i  : separated object signal                     */

    float input_f_in[][L_FRAME48k], /* i  : separated object signal                     */

#endif

    float *output_f[],                /* o  : rendered time signal                        */

    const int16_t subframes_rendered, /* i  : number of subframes rendered                */
@@ -643,9 +643,7 @@ void ivas_omasa_separate_object_render_jbm( 
    int16_t azimuth, elevation;

    int16_t num_objects;

    uint8_t single_separated;

#ifndef NONBE_UNIFIED_DECODING_PATHS_FIX

    float *input_f[MAX_TRANSPORT_CHANNELS];

#endif

    float *output_f_local[MAX_OUTPUT_CHANNELS];

    int16_t offsetSamples;

    int16_t n_samples_sf, md_idx;
@@ -676,11 +674,24 @@ void ivas_omasa_separate_object_render_jbm( 
    {

        output_f_local[j] = output_f[j];

    }

#ifndef NONBE_UNIFIED_DECODING_PATHS_FIX



#ifdef NONBE_UNIFIED_DECODING_PATHS_FIX

    if ( st_ivas->hDecoderConfig->Opt_tsm )

    {

#endif

        for ( obj = 0; obj < num_objects; obj++ )

        {

            input_f[obj] = &st_ivas->hTcBuffer->tc[obj + 2][offsetSamples];

        }

#ifdef NONBE_UNIFIED_DECODING_PATHS_FIX

    }

    else

    {

        for ( obj = 0; obj < num_objects; obj++ )

        {

            input_f[obj] = input_f_in[obj];

        }

    }

#endif



    slots_to_render = nSamplesRendered / hSpatParamRendCom->slot_size;