Commit e72658e9 authored by vaclav's avatar vaclav
Browse files

Merge branch '1101-obosolete-call-of-ivas_jbm_dec_tc_buffer_open' into 'main' 

Resolve "Obsolete call of ivas_jbm_dec_tc_buffer_open()"

See merge request !1587
parents fe197c3c 0daec169

lib_com/ivas_cnst.h

+2 −0
Original line number Diff line number Diff line
@@ -179,7 +179,9 @@ typedef enum 


typedef enum

{

#ifndef FIX_1101_CLEANING_JBM_CALL

    TC_BUFFER_MODE_NONE = 0,

#endif

    TC_BUFFER_MODE_RENDERER,

    TC_BUFFER_MODE_BUFFER

} TC_BUFFER_MODE;

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ 


#define FIX_1099_JBM_MD_HANDLE_ALLOC                    /* VA: issue 1099: Limit the allocation of `hJbmMetadata` handle to MASA and OMASA only */

#define FIX_1111_TDM_LSP_BUFFER                         /* VA: issue 1111: remove unused buffer `tdm_lspQ_PCh[]' */

#define FIX_1101_CLEANING_JBM_CALL                      /* VA: issue 1101: remove obsolete call of ivas_jbm_dec_tc_buffer_open() */



/* #################### End BE switches ################################## */

lib_dec/ivas_init_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -2063,6 +2063,7 @@ ivas_error ivas_init_decoder( 
        }

    }



#ifndef FIX_1101_CLEANING_JBM_CALL

    if ( st_ivas->hTcBuffer == NULL )

    {

        /* we need the handle anyway, but without the buffer*/
@@ -2072,6 +2073,7 @@ ivas_error ivas_init_decoder( 
        }

    }



#endif

#ifdef FIX_1099_JBM_MD_HANDLE_ALLOC

    if ( ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) && st_ivas->hDecoderConfig->Opt_tsm )

#else

lib_dec/ivas_jbm_dec.c

+28 −2
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ ivas_error ivas_jbm_dec_tc( 
        }

    }



#ifndef FIX_1101_CLEANING_JBM_CALL

    if ( !st_ivas->hDecoderConfig->Opt_tsm )

    {

        for ( n = 0; n < ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate ); n++ )
@@ -110,7 +111,7 @@ ivas_error ivas_jbm_dec_tc( 
            st_ivas->hTcBuffer->tc[n] = st_ivas->p_output_f[n];

        }

    }



#endif

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

     * Decoding + pre-rendering

     *----------------------------------------------------------------*/
@@ -800,7 +801,16 @@ void ivas_jbm_dec_feed_tc_to_renderer( 
        p_data_f[n] = &data_f[n][0];

    }



#ifdef FIX_1101_CLEANING_JBM_CALL

    if ( !st_ivas->hDecoderConfig->Opt_tsm )

    {

        for ( n = 0; n < ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate ); n++ )

        {

            st_ivas->hTcBuffer->tc[n] = st_ivas->p_output_f[n]; /* note: buffers needed in the TD decorellator */

        }

    }



#endif

    if ( st_ivas->hDecoderConfig->Opt_tsm )

    {

        ivas_jbm_dec_copy_tc( st_ivas, nSamplesForRendering, nSamplesResidual, data, p_data_f );
@@ -2288,6 +2298,7 @@ ivas_error ivas_jbm_dec_tc_buffer_open( 
    set_s( hTcBuffer->subframe_nbslots, 0, MAX_JBM_SUBFRAMES_5MS );

    set_s( hTcBuffer->subframe_nbslots, nMaxSlotsPerSubframe, MAX_PARAM_SPATIAL_SUBFRAMES );



#ifndef FIX_1101_CLEANING_JBM_CALL

    if ( hTcBuffer->tc_buffer_mode == TC_BUFFER_MODE_NONE )

    {

        hTcBuffer->tc_buffer = NULL;
@@ -2298,6 +2309,7 @@ ivas_error ivas_jbm_dec_tc_buffer_open( 
        }

    }

    else

#endif

    {

        int16_t n_samp_full, n_samp_residual;

        int32_t offset;
@@ -2724,7 +2736,9 @@ void ivas_jbm_dec_copy_tc_no_tsm( 
    const int16_t output_frame /* i  : output frame size        */

)

{

#ifndef FIX_1101_CLEANING_JBM_CALL

    int16_t n_ch_full_copy;

#endif

    int16_t n_ch_cldfb;

    int16_t ch_idx;

    DECODER_TC_BUFFER_HANDLE hTcBuffer;
@@ -2732,9 +2746,16 @@ void ivas_jbm_dec_copy_tc_no_tsm( 
    hTcBuffer = st_ivas->hTcBuffer;

    hTcBuffer->n_samples_buffered = output_frame;

    hTcBuffer->n_samples_available = hTcBuffer->n_samples_buffered;

#ifndef FIX_1101_CLEANING_JBM_CALL

    n_ch_full_copy = min( hTcBuffer->nchan_transport_jbm, hTcBuffer->nchan_buffer_full );

#endif

    n_ch_cldfb = hTcBuffer->nchan_transport_jbm - hTcBuffer->nchan_buffer_full;



#ifdef FIX_1101_CLEANING_JBM_CALL

#ifdef DEBUGGING

    assert( st_ivas->hDecoderConfig->Opt_tsm == 0 );

#endif

#else

    /* copy full tcs*/

    if ( st_ivas->hDecoderConfig->Opt_tsm )

    {
@@ -2745,6 +2766,7 @@ void ivas_jbm_dec_copy_tc_no_tsm( 
    }

    ch_idx = 0;



#endif

    /* CLDFB ana for ParamMC/ParamISM */

    if ( n_ch_cldfb > 0 )

    {
@@ -2775,9 +2797,13 @@ void ivas_jbm_dec_copy_tc_no_tsm( 
            assert( 0 && "Residual (direct CLDFB transport channels) only possible for ParamMC/ParamISM!" );

        }

#endif

        /* CLDFB Analysis*/



        /* CLDFB Analysis*/

#ifdef FIX_1101_CLEANING_JBM_CALL

        for ( ch_idx = 0, cldfb_ch = 0; cldfb_ch < n_ch_cldfb; cldfb_ch++, ch_idx++ )

#else

        for ( cldfb_ch = 0; cldfb_ch < n_ch_cldfb; cldfb_ch++, ch_idx++ )

#endif

        {

            for ( slot_idx = 0; slot_idx < DEFAULT_JBM_CLDFB_TIMESLOTS; slot_idx++ )

            {