Commit 45d7cd96 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Revert "[cleanup] accept NONBE_1324_TC_BUFFER_MEMOERY_KEEP" 

This reverts commit 7987fa59.
parent 4fb9f651

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -187,6 +187,8 @@ 
#define NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG       /* FhG: Fix MDCT-Stereo comfort noise for certain noise types */

#define NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS    /* FhG: fix non-BE in DFT stereo encoder between optimization levels */



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



/* ##################### End NON-BE switches ########################### */



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_jbm_dec.c

+12 −0
Original line number Diff line number Diff line
@@ -2284,13 +2284,16 @@ 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;
@@ -2309,6 +2312,7 @@ ivas_error ivas_jbm_dec_tc_buffer_reconfigure( 
        }

    }



#endif

    /* if granularity changes, adapt subframe_nb_slots */

    if ( n_samples_granularity != hTcBuffer->n_samples_granularity )

    {
@@ -2348,6 +2352,12 @@ ivas_error ivas_jbm_dec_tc_buffer_reconfigure( 
    hTcBuffer->nchan_buffer_full = nchan_full;

    hTcBuffer->n_samples_granularity = n_samples_granularity;



#ifndef NONBE_1324_TC_BUFFER_MEMOERY_KEEP

#ifdef DEBUGGING

    /* what is remaining from last frames needs always be smaller than n_samples_granularity */

    assert( ( hTcBuffer->n_samples_buffered - hTcBuffer->n_samples_rendered ) < n_samples_granularity );

#endif

#endif

    /* reallocate TC audio buffers */



    ivas_jbm_dec_tc_audio_deallocate( hTcBuffer );
@@ -2357,12 +2367,14 @@ 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;

}