Commit 99a7a9fd authored by vaclav's avatar vaclav
Browse files

revert the MASA discontinuity fix

parent e0cdbf2f

lib_dec/ivas_jbm_dec.c

+0 −21
Original line number Diff line number Diff line
@@ -2384,23 +2384,10 @@ ivas_error ivas_jbm_dec_tc_buffer_reconfigure( 
{

    int16_t nsamp_to_allocate, n_samp_full, n_samp_residual, offset, nchan_residual;

    int16_t ch_idx;

#ifdef FIX_NCHAN_BUFFERS

    float tc_buffer_mem[CPE_CHANNELS * MAX_JBM_L_FRAME48k];

    int16_t num_tc_buffer_mem;

#endif

    DECODER_TC_BUFFER_HANDLE hTcBuffer;



    hTcBuffer = st_ivas->hTcBuffer;



#ifdef FIX_NCHAN_BUFFERS

    /* 2 channels of the TC buffer for smooth transition in bitrate swithing within 1 CPE and TD decorr. on and off */

    num_tc_buffer_mem = min( hTcBuffer->nchan_buffer_full, CPE_CHANNELS );

    if ( st_ivas->hDecoderConfig->Opt_tsm && num_tc_buffer_mem == CPE_CHANNELS )

    {

        mvr2r( hTcBuffer->tc_buffer, tc_buffer_mem, num_tc_buffer_mem * NS2SA( st_ivas->hDecoderConfig->output_Fs, MAX_JBM_L_FRAME_NS ) );

    }



#endif

    /* if granularity changes, adapt subframe_nb_slots */

    if ( n_samples_granularity != hTcBuffer->n_samples_granularity )

    {
@@ -2505,14 +2492,6 @@ ivas_error ivas_jbm_dec_tc_buffer_reconfigure( 
        }

    }



#ifdef FIX_NCHAN_BUFFERS

    if ( st_ivas->hDecoderConfig->Opt_tsm && num_tc_buffer_mem == CPE_CHANNELS && hTcBuffer->nchan_buffer_full == CPE_CHANNELS )

    {

        // Note: keep deactivated for the moment to ensure BE results for 'stv'

        // mvr2r( tc_buffer_mem, hTcBuffer->tc_buffer, num_tc_buffer_mem * NS2SA( st_ivas->hDecoderConfig->output_Fs, MAX_JBM_L_FRAME_NS ) );

    }



#endif

    return IVAS_ERR_OK;

}