Commit a425704b authored by sagnowski's avatar sagnowski
Browse files

Do not allocate a bigger CLDFB ring buffer when TSM is enabled

parent 11b818b7

lib_dec/lib_dec.c

+2 −12
Original line number Diff line number Diff line
@@ -5418,7 +5418,7 @@ static ivas_error ivas_dec_init_split_rend( 
    int16_t cldfb_in_flag, pcm_out_flag;

    int16_t mixed_td_cldfb_flag;

#ifdef FIX_1119_SPLIT_RENDERING_VOIP

    int16_t i, num_poses, cldfb_buffer_capacity;

    int16_t i, num_poses;

#endif



    pcm_out_flag = ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0;
@@ -5439,20 +5439,10 @@ static ivas_error ivas_dec_init_split_rend( 


    if ( cldfb_in_flag )

    {

        if ( st_ivas->hDecoderConfig->Opt_tsm )

        {

            /* With TSM we need more space for stretched frames */

            cldfb_buffer_capacity = CLDFB_NO_COL_MAX * 2;

        }

        else

        {

            cldfb_buffer_capacity = CLDFB_NO_COL_MAX;

        }



        for ( i = 0; i < (int16_t) ( num_poses * BINAURAL_CHANNELS ); ++i )

        {

            /* note: this is intra-frame heap memory */

            error = CLDFB_RINGBUF_Open( &st_ivas->hSplitBinRend->hMultiBinCldfbData[i], cldfb_buffer_capacity );

            error = CLDFB_RINGBUF_Open( &st_ivas->hSplitBinRend->hMultiBinCldfbData[i], CLDFB_NO_COL_MAX );

            if ( error != IVAS_ERR_OK )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for split rendering structure" );