Commit 9dc5c8e2 authored by vaclav's avatar vaclav
Browse files

issue 1101: remove obsolete call of ivas_jbm_dec_tc_buffer_open(); under FIX_1101_CLEANING_JBM_CALL

parent 9f58d491

lib_com/ivas_cnst.h

+2 −0
Original line number Diff line number Diff line
@@ -179,7 +179,9 @@ typedef enum 


typedef enum

{

#ifndef FIX_1101_CLEANING_JBM_CALL

    TC_BUFFER_MODE_NONE = 0,

#endif

    TC_BUFFER_MODE_RENDERER,

    TC_BUFFER_MODE_BUFFER

} TC_BUFFER_MODE;

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ 
#define FIX_989_TD_REND_ROM                             /* Eri: Clean-up for TD renderer and completion of ROM generation tool */



#define FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR          /* issue 1068 : Memory leak in MC to BINAURAL_ROOM decoding with bitrate switching*/

#define FIX_1101_CLEANING_JBM_CALL                      /* VA: issue 1101: remove obsolete call of ivas_jbm_dec_tc_buffer_open() */



/* #################### End BE switches ################################## */

lib_dec/ivas_init_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -2413,6 +2413,7 @@ ivas_error ivas_init_decoder( 
        }

    }



#ifndef FIX_1101_CLEANING_JBM_CALL

    if ( st_ivas->hTcBuffer == NULL )

    {

        /* we need the handle anyway, but without the buffer*/
@@ -2422,6 +2423,7 @@ ivas_error ivas_init_decoder( 
        }

    }



#endif

    if ( st_ivas->hJbmMetadata == NULL && st_ivas->hDecoderConfig->Opt_tsm )

    {

        if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

lib_dec/ivas_jbm_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -2378,6 +2378,7 @@ ivas_error ivas_jbm_dec_tc_buffer_open( 
    set_s( hTcBuffer->subframe_nbslots, 0, MAX_JBM_SUBFRAMES_5MS );

    set_s( hTcBuffer->subframe_nbslots, nMaxSlotsPerSubframe, MAX_PARAM_SPATIAL_SUBFRAMES );



#ifndef FIX_1101_CLEANING_JBM_CALL

    if ( hTcBuffer->tc_buffer_mode == TC_BUFFER_MODE_NONE )

    {

        hTcBuffer->tc_buffer = NULL;
@@ -2388,6 +2389,7 @@ ivas_error ivas_jbm_dec_tc_buffer_open( 
        }

    }

    else

#endif

    {

        int16_t n_samp_full, n_samp_residual;

        int32_t offset;