Commit 0455292c authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Revert "basop operators; align with float" 

This reverts commit 94e7c3cf.
parent 94e7c3cf

lib_dec/ivas_jbm_dec_fx.c

+4 −4
Original line number Diff line number Diff line
@@ -2549,7 +2549,7 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
        {

            /* move it at the beginning of the TC buffer with zero padding */

            Copy32( hTcBuffer->tc_buffer_old_fx[ch_idx], hTcBuffer->tc_fx[ch_idx], n_samples_to_render );

            set_zero_fx( hTcBuffer->tc_fx[ch_idx] + n_samples_to_render, sub( hTcBuffer->n_samples_granularity, n_samples_to_render ) );

            set_zero_fx( hTcBuffer->tc_fx[ch_idx] + n_samples_to_render, hTcBuffer->n_samples_granularity - n_samples_to_render );

        }

#else

        /* render what is still there with zero padding */
@@ -3369,7 +3369,7 @@ static ivas_error ivas_jbm_dec_tc_audio_allocate_fx( 
        move16();

    }



    nsamp_to_allocate = imult1616( s_max( hTcBuffer->nchan_transport_jbm, hTcBuffer->nchan_buffer_full ), n_samp_full );

    nsamp_to_allocate = s_max( hTcBuffer->nchan_transport_jbm, hTcBuffer->nchan_buffer_full ) * n_samp_full;



    IF( Opt_tsm )

    {
@@ -3382,7 +3382,7 @@ static ivas_error ivas_jbm_dec_tc_audio_allocate_fx( 


        offset = 0;

        move16();

        FOR( ch_idx = 0; ch_idx < s_max( hTcBuffer->nchan_transport_jbm, hTcBuffer->nchan_buffer_full ); ch_idx++ )

        FOR( ch_idx = 0; ch_idx < max( hTcBuffer->nchan_transport_jbm, hTcBuffer->nchan_buffer_full ); ch_idx++ )

        {

            hTcBuffer->tc_fx[ch_idx] = &hTcBuffer->tc_buffer_fx[offset];

            offset = add( offset, n_samp_full );
@@ -3462,7 +3462,6 @@ static void ivas_jbm_dec_tc_audio_deallocate_fx( 


    return;

}



#endif



/*--------------------------------------------------------------------------*
@@ -3471,6 +3470,7 @@ static void ivas_jbm_dec_tc_audio_deallocate_fx( 
 * open and initialize JBM transport channel buffer

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





ivas_error ivas_jbm_dec_tc_buffer_open_fx(

    Decoder_Struct *st_ivas,               /* i/o: IVAS decoder structure              */

    const TC_BUFFER_MODE tc_buffer_mode,   /* i  : buffer mode                         */

lib_dec/lib_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1217,11 +1217,7 @@ ivas_error IVAS_DEC_GetSamplesRenderer( 
        hIvasDec->hasBeenFedFrame = false;



        /* check for possible flushed samples from a rate switch */

#ifdef NONBE_1324_TC_BUFFER_MEMOERY_KEEP

        IF( GT_16( hIvasDec->nSamplesFlushed, 0 ) )

#else

        IF( GE_16( hIvasDec->nSamplesFlushed, 0 ) )

#endif

        {

            /* note: offset (rendered samples) is always 0 */

            Copy( hIvasDec->flushbuffer, pcmBuf, imult1616( hIvasDec->nSamplesFlushed, nOutChannels ) );