Commit d53c42dd authored by vaclav's avatar vaclav
Browse files

fix flush

parent 810ab22d

lib_dec/ivas_init_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -356,7 +356,11 @@ ivas_error ivas_dec_get_format_fx( 
            {

                sba_order = st_ivas->bit_stream[num_bits_read + 1];

                move16();

#ifdef FIX_HRTF_LOAD

                sba_order = add( sba_order, shl( st_ivas->bit_stream[num_bits_read], 1 ) );

#else

                sba_order = shl( st_ivas->bit_stream[num_bits_read], 1 );

#endif

                num_bits_read = add( num_bits_read, SBA_ORDER_BITS );

            }

lib_dec/lib_dec_fx.c

+9 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ struct IVAS_DEC 


#ifdef FIX_HRTF_LOAD

    UWord16 nSamplesFlushed;

    Word16 *flushbuffer;

    Word16 flushbuffer[20 * 960]; // temp. hack

    bool hasBeenPreparedRendering;

#endif

};
@@ -1969,6 +1969,8 @@ static ivas_error IVAS_DEC_GetRenderedSamples( 
    st_ivas = hIvasDec->st_ivas;



#ifdef FIX_HRTF_LOAD

    // temp code to make HRTF changes working in the old API structure

    UWord16 nSamplesRendered_loop = 0;

    Word16 nOutChannels = st_ivas->hDecoderConfig->nchan_out;

    move16();

    hIvasDec->hasBeenFedFrame = false;
@@ -1985,9 +1987,14 @@ static ivas_error IVAS_DEC_GetRenderedSamples( 
        move16();

    }



#endif

    /* run the main IVAS decoding routine */

    error = ivas_jbm_dec_render_fx( st_ivas, nSamplesForRendering, &nSamplesRendered_loop, nSamplesAvailableNext, pcmBuf );



    *nSamplesRendered = add( *nSamplesRendered, nSamplesRendered_loop );

#else

    /* run the main IVAS decoding routine */

    error = ivas_jbm_dec_render_fx( st_ivas, nSamplesForRendering, nSamplesRendered, nSamplesAvailableNext, pcmBuf );

#endif



    return error;

}