Commit 544d3aad authored by emerit's avatar emerit
Browse files

merge versions

parent 84301fb0
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -451,10 +451,7 @@ ivas_error ivas_dec_setup(
     * Read IVAS format
     *-------------------------------------------------------------------*/

    IF( ( error = ivas_read_format( st_ivas, &num_bits_read ) ) != IVAS_ERR_OK )
    {
        return error;
    }
    ivas_read_format( st_ivas, &num_bits_read );

    Word16 SrcInd[MAX_NUM_TDREND_CHANNELS];
    Word16 num_src = 0;
+91 −93
Original line number Diff line number Diff line
@@ -1211,12 +1211,10 @@ ivas_error IVAS_DEC_GetSamples(
    {
        /* check if we need to run the setup function */
        test();
        IF( !hIvasDec->isInitialized || hIvasDec->hasBeenFedFrame )
        {
        IF( !hIvasDec->isInitialized || hIvasDec->hasBeenFedFrame ){
            /* setup */

            IF( NE_32( ( error = IVAS_DEC_Setup( hIvasDec, &l_ts, &nTransportChannels, &nOutChannels, &nSamplesRendered_loop, pcmBuf + imult3216( nSamplesRendered, nOutChannels ) ) ), IVAS_ERR_OK ) )
            {
            IF( NE_32( ( error = IVAS_DEC_Setup( hIvasDec, &l_ts, &nTransportChannels, &nOutChannels, &nSamplesRendered_loop, pcmBuf + imult3216( nSamplesRendered, nOutChannels ) ) ), IVAS_ERR_OK ) ){
                return error;
    }
}
+3 −4
Original line number Diff line number Diff line
@@ -413,9 +413,8 @@ static ivas_error DefaultBSplineModel_fx(
    ivas_error error;
#ifdef FIX_TDREND_HRTF_FILE_FORMAT
    Word16 azimSegSamples;
#endif
    set_c( (int8_t *) HrFiltSet_p, 0, (int32_t) sizeof( TDREND_HRFILT_FiltSet_t ) );

#endif
    HrFiltSet_p->FilterMethod = TDREND_HRFILT_Method_BSplineModel;
    move16();
    model = &( HrFiltSet_p->ModelParams );
+3 −3

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.

+13 −13

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.

Loading