Commit 4dc42bc7 authored by vaclav's avatar vaclav
Browse files

fix max number of hTcBuffer->tc[] channels

parent a7e57fa6

lib_dec/ivas_jbm_dec.c

+7 −7
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ ivas_error ivas_jbm_dec_render( 
        }



#ifdef REMOVE_APA_BUFFER

        for ( n = 0; n < MAX_TRANSPORT_CHANNELS; n++ )

        for ( n = 0; n < MAX_INTERN_CHANNELS; n++ )

#else

        for ( n = 0; n < MAX_TRANSPORT_CHANNELS + MAX_NUM_OBJECTS; n++ )

#endif
@@ -2274,7 +2274,7 @@ static ivas_error ivas_jbm_dec_tc_audio_allocate( 
            hTcBuffer->tc[ch_idx] = &hTcBuffer->tc_buffer[offset];

            offset += n_samp_full;

        }

        for ( ; ch_idx < MAX_TRANSPORT_CHANNELS; ch_idx++ )

        for ( ; ch_idx < MAX_INTERN_CHANNELS; ch_idx++ )

        {

            hTcBuffer->tc[ch_idx] = NULL;

        }
@@ -2288,7 +2288,7 @@ static ivas_error ivas_jbm_dec_tc_audio_allocate( 
            }

            set_zero( hTcBuffer->tc_buffer_old[ch_idx], n_samp_residual );

        }

        for ( ; ch_idx < MAX_TRANSPORT_CHANNELS; ch_idx++ )

        for ( ; ch_idx < MAX_INTERN_CHANNELS; ch_idx++ )

        {

            hTcBuffer->tc_buffer_old[ch_idx] = NULL;

        }
@@ -2297,12 +2297,12 @@ static ivas_error ivas_jbm_dec_tc_audio_allocate( 
    {

        hTcBuffer->tc_buffer = NULL;



        for ( ch_idx = 0; ch_idx < MAX_TRANSPORT_CHANNELS; ch_idx++ )

        for ( ch_idx = 0; ch_idx < MAX_INTERN_CHANNELS; ch_idx++ )

        {

            hTcBuffer->tc[ch_idx] = NULL;

        }



        for ( ch_idx = 0; ch_idx < MAX_TRANSPORT_CHANNELS; ch_idx++ )

        for ( ch_idx = 0; ch_idx < MAX_INTERN_CHANNELS; ch_idx++ )

        {

            hTcBuffer->tc_buffer_old[ch_idx] = NULL;

        }
@@ -2328,7 +2328,7 @@ static void ivas_jbm_dec_tc_audio_deallocate( 
    {

        if ( hTcBuffer->tc_buffer != NULL )

        {

            for ( ch_idx = 0; ch_idx < MAX_TRANSPORT_CHANNELS; ch_idx++ )

            for ( ch_idx = 0; ch_idx < MAX_INTERN_CHANNELS; ch_idx++ )

            {

                hTcBuffer->tc[ch_idx] = NULL;

            }
@@ -2337,7 +2337,7 @@ static void ivas_jbm_dec_tc_audio_deallocate( 
            hTcBuffer->tc_buffer = NULL;

        }



        for ( ch_idx = 0; ch_idx < MAX_TRANSPORT_CHANNELS; ch_idx++ )

        for ( ch_idx = 0; ch_idx < MAX_INTERN_CHANNELS; ch_idx++ )

        {

            if ( hTcBuffer->tc_buffer_old[ch_idx] != NULL )

            {

lib_dec/ivas_stat_dec.h

+2 −2
Original line number Diff line number Diff line
@@ -945,11 +945,11 @@ typedef struct ivas_masa_ism_data_structure 
typedef struct decoder_tc_buffer_structure

{

#ifdef REMOVE_APA_BUFFER

    float *tc_buffer_old[MAX_TRANSPORT_CHANNELS]; /* TC audio samples not rendered in the previous frame */

    float *tc_buffer_old[MAX_INTERN_CHANNELS]; /* TC audio samples not rendered in the previous frame */

#endif

    float *tc_buffer; /* the buffer itself                                                        */

#ifdef REMOVE_APA_BUFFER

    float *tc[MAX_TRANSPORT_CHANNELS]; /* pointers into the buffer to the beginning of each tc                     */

    float *tc[MAX_INTERN_CHANNELS]; /* pointers into the buffer to the beginning of each tc                     */

#else

    float *tc[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS]; /* pointers into the buffer to the beginning of each tc                     */ // VE2SB: TBV

#endif