Commit 56e710a9 authored by bayers's avatar bayers
Browse files

temp fix for #834, get correct count of old number of channels allocated on the heap

parent 5c769f4d

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ 
/*#define UNIFY_CHANNEL_MEM_HEAP*/

#define FIX_XXX_CREND_ER

#define FIX_XXX_JBM_FOR_OSBA

#define FIX_XXX_CHANNEL_MEM_COUNT

#endif

#define NONBE_FIX_722_MEMORY_LEAK_IN_PARAMUPMIX               /* Dlb : issue 722: memory leak fix in MC param upmix mode with BR switching*/

#define NONBE_FIX_780_ISM_STARTS_WITH_SID                     /* VA: issue 780: fix Crash in ISM decoding when bitstream starts with an SID and output_config is not EXT */

lib_dec/ivas_ism_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
    st_ivas->ism_mode = last_ism_mode;

    ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old );

    st_ivas->ism_mode = ism_mode;

#ifdef UNIFY_CHANNEL_MEM_HEAP

#ifdef FIX_XXX_CHANNEL_MEM_COUNT

    nchan_out_buff_old = ivas_count_nchan_buffers_dec( st_ivas );

#else

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

lib_dec/ivas_omasa_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ ivas_error ivas_omasa_dec_config( 
    ivas_format_orig = st_ivas->ivas_format;

    st_ivas->ivas_format = st_ivas->last_ivas_format;

    ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old );

#ifdef UNIFY_CHANNEL_MEM_HEAP

#ifdef FIX_XXX_CHANNEL_MEM_COUNT

    nchan_out_buff_old = ivas_count_nchan_buffers_dec( st_ivas );

#else

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

lib_dec/ivas_sba_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ ivas_error ivas_sba_dec_reconfigure( 
     * Set SBA high-level parameters

     * Save old SBA high-level parameters

     *-----------------------------------------------------------------*/

#ifdef UNIFY_CHANNEL_MEM_HEAP

#ifdef FIX_XXX_CHANNEL_MEM_COUNT

    nchan_out_buff_old = ivas_count_nchan_buffers_dec( st_ivas );

#else

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

lib_rend/ivas_output_init.c

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ int16_t ivas_get_nchan_buffers_dec( 
    return nchan_out_buff;

}



#ifdef UNIFY_CHANNEL_MEM_HEAP

#ifdef FIX_XXX_CHANNEL_MEM_COUNT

/*-----------------------------------------------------------------*

 * ivas_count_nchan_buffers_dec()

 *