Commit 6dff75d4 authored by vaclav's avatar vaclav
Browse files

fix

parent aa35e196

lib_dec/ivas_jbm_dec_fx.c

+7 −2
Original line number Diff line number Diff line
@@ -1678,7 +1678,7 @@ void ivas_jbm_dec_feed_tc_to_renderer_fx( 


#ifdef FIX_NCHAN_BUFFERS

#ifdef JBM_MEMORY_OPT

        ch = max( hTcBuffer->nchan_transport_jbm, hTcBuffer->nchan_buffer_full );

        ch = s_max( hTcBuffer->nchan_transport_jbm, hTcBuffer->nchan_buffer_full );

#else

        ch = ivas_get_nchan_buffers_dec_fx( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate );

#endif
@@ -3962,7 +3962,7 @@ ivas_error ivas_jbm_dec_tc_buffer_reconfigure_fx( 


    ivas_jbm_dec_tc_audio_deallocate_fx( hTcBuffer );



    if ( ( error = ivas_jbm_dec_tc_audio_allocate_fx( hTcBuffer, st_ivas->hDecoderConfig->output_Fs, st_ivas->hDecoderConfig->Opt_tsm ) ) != IVAS_ERR_OK )

    IF( ( error = ivas_jbm_dec_tc_audio_allocate_fx( hTcBuffer, st_ivas->hDecoderConfig->output_Fs, st_ivas->hDecoderConfig->Opt_tsm ) ) != IVAS_ERR_OK )

    {

        return error;

    }
@@ -4101,6 +4101,10 @@ void ivas_jbm_dec_tc_buffer_close_fx( 


    IF( *phTcBuffer != NULL )

    {

#ifdef JBM_MEMORY_OPT

        ivas_jbm_dec_tc_audio_deallocate_fx( *phTcBuffer );

#else



        FOR( i = 0; i < MAX_TRANSPORT_CHANNELS + MAX_NUM_OBJECTS; i++ )

        {

            ( *phTcBuffer )->tc_fx[i] = NULL;
@@ -4111,6 +4115,7 @@ void ivas_jbm_dec_tc_buffer_close_fx( 
            free( ( *phTcBuffer )->tc_buffer_fx );

            ( *phTcBuffer )->tc_buffer_fx = NULL;

        }

#endif



        free( *phTcBuffer );

        *phTcBuffer = NULL;

lib_dec/lib_dec_fx.c

+10 −2
Original line number Diff line number Diff line
@@ -3844,7 +3844,7 @@ ivas_error IVAS_DEC_ReadFormat( 
#ifdef JBM_MEMORY_OPT



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

 * IVAS_DEC_GetEditableParameters( )

 * apa_exec_evs_wrapper( )

 *

 *

 *---------------------------------------------------------------------*/
@@ -3858,6 +3858,13 @@ static ivas_error apa_exec_evs_wrapper( 
    Word16 tmp_apaExecBuffer[APA_BUF / APA_MAX_NUM_CHANNELS * 2]; /* in EVS, 2 output channels */

    DECODER_TC_BUFFER_HANDLE hTcBuffer;



    test();

    test();

    IF( hIvasDec == NULL || hIvasDec->st_ivas == NULL || hIvasDec->st_ivas->hTcBuffer == NULL )

    {

        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }



    hTcBuffer = hIvasDec->st_ivas->hTcBuffer;



    FOR( ch = 0; ch < APA_BUF_PER_CHANNEL * nTransportChannels; ++ch )
@@ -3900,6 +3907,7 @@ ivas_error IVAS_DEC_GetSamplesDecoder( 
    bool isInitialized_voip;

#endif



    test();

    IF( hIvasDec == NULL || hIvasDec->st_ivas == NULL )

    {

        return IVAS_ERR_UNEXPECTED_NULL_POINTER;
@@ -3916,6 +3924,7 @@ ivas_error IVAS_DEC_GetSamplesDecoder( 
    st_ivas = hIvasDec->st_ivas;

#ifdef LIB_DEC_REVISION

#ifdef JBM_MEMORY_OPT

    test();

    isInitialized_voip = hIvasDec->hTimeScaler != NULL;

#else

    isInitialized_voip = hIvasDec->apaExecBuffer_fx != NULL;
@@ -4027,7 +4036,6 @@ ivas_error IVAS_DEC_GetSamplesDecoder( 
#endif

#endif



            // tmp apaExecBuffer

            IF( EQ_16( (Word16) hIvasDec->mode, IVAS_DEC_MODE_EVS ) )

            {

#ifdef JBM_MEMORY_OPT