Commit 017618d7 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_1324_TC_BUFFER_MEMOERY_KEEP

parent e650f528

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ 
#define FIX_1384_MSAN_ivas_spar_dec_open                /* VA: issue 1386: fix use-of-uninitialized value in ivas_spar_dec_open() */

#define FIX_1388_MSAN_ivas_init_decoder                 /* VA: issue 1388: fix use-of-uninitialized value in ivas_init_decoder() */

#define FIX_1288_SPLIT_REND_XSAN                        /* Dlb: Fix asan, msan and usan issues in split rendering mode*/

#define NONBE_1324_TC_BUFFER_MEMOERY_KEEP               /* VA: issue 1324: do not reset TSM memory in JBM bitrate switching */

#define FIX_1370_EXTERNAL_ORIENTATION_CHECK             /* Nokia: add sanity check for Euler angles for external orientations */

#define FIX_1413_IGF_INIT_PRINTOUT                      /* FhG: use correct variable for IGF initiliazation */

#define FIX_1330_JBM_MEMORY                             /* VA: issue 1330: memory savings in the JBM decoder */

lib_dec/ivas_jbm_dec.c

+0 −6
Original line number Diff line number Diff line
@@ -2331,16 +2331,13 @@ ivas_error ivas_jbm_dec_tc_buffer_reconfigure( 
    const int16_t n_samples_granularity     /* i  : new granularity of the renderer/buffer  */

)

{

#ifdef NONBE_1324_TC_BUFFER_MEMOERY_KEEP

    int16_t ch_idx, num_tc_buffer_mem, n_samples_still_available;

    float tc_buffer_mem[MAX_INTERN_CHANNELS][L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES - 1];

#endif

    ivas_error error;

    DECODER_TC_BUFFER_HANDLE hTcBuffer;



    hTcBuffer = st_ivas->hTcBuffer;



#ifdef NONBE_1324_TC_BUFFER_MEMOERY_KEEP

    num_tc_buffer_mem = 0;

    n_samples_still_available = 0;
@@ -2359,7 +2356,6 @@ ivas_error ivas_jbm_dec_tc_buffer_reconfigure( 
        }

    }



#endif

    /* if granularity changes, adapt subframe_nb_slots */

    if ( n_samples_granularity != hTcBuffer->n_samples_granularity )

    {
@@ -2408,14 +2404,12 @@ ivas_error ivas_jbm_dec_tc_buffer_reconfigure( 
        return error;

    }



#ifdef NONBE_1324_TC_BUFFER_MEMOERY_KEEP

    /* propagate samples of the TC buffer from the previous frame */

    for ( ch_idx = 0; ch_idx < num_tc_buffer_mem; ch_idx++ )

    {

        mvr2r( tc_buffer_mem[ch_idx], hTcBuffer->tc_buffer_old[ch_idx], n_samples_still_available );

    }



#endif

    return IVAS_ERR_OK;

}