Commit a48d55a8 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch '1859_fix_ivas_get_nchan_buffers_dec_duplication' into 'main' 

Fix duplication of ivas_get_nchan_buffers_dec

See merge request !1983
parents 2dba6296 4b40160d

lib_dec/ivas_init_dec_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -2809,9 +2809,9 @@ ivas_error ivas_init_decoder_fx( 
    /*-----------------------------------------------------------------*

     * Allocate floating-point output audio buffers

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

    st_ivas->p_out_len = ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate );

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

    move16();

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

    FOR( n = 0; n < ivas_get_nchan_buffers_dec_fx( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate ); n++ )

    {

        /* note: these are intra-frame heap memories */

        IF( ( st_ivas->p_output_fx[n] = (Word32 *) malloc( ( 48000 / FRAMES_PER_SEC ) * sizeof( Word32 ) ) ) == NULL )

lib_dec/ivas_ism_dec_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx( 
    ivas_init_dec_get_num_cldfb_instances_ivas_fx( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old );

    st_ivas->ism_mode = ism_mode;

    move16();

    nchan_out_buff_old = ivas_get_nchan_buffers_dec_ivas_fx( st_ivas, -1, -1 );

    nchan_out_buff_old = ivas_get_nchan_buffers_dec_fx( st_ivas, -1, -1 );



    IF( NE_32( ( error = ivas_ism_config_fx( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->nchan_ism, NULL, 0, NULL, NULL, element_brate_tmp, NULL, NULL, 0 ) ), IVAS_ERR_OK ) )

    {
@@ -320,7 +320,7 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx( 
     *-----------------------------------------------------------------*/



    {

        nchan_out_buff = ivas_get_nchan_buffers_dec( st_ivas, -1, -1 );

        nchan_out_buff = ivas_get_nchan_buffers_dec_fx( st_ivas, -1, -1 );



        IF( NE_32( ( error = ivas_output_buff_dec_fx( st_ivas->p_output_fx, nchan_out_buff_old, nchan_out_buff ) ), IVAS_ERR_OK ) )

        {

lib_dec/ivas_jbm_dec_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -124,12 +124,12 @@ ivas_error ivas_jbm_dec_tc_fx( 


    IF( st_ivas->hDecoderConfig->Opt_tsm == 0 )

    {

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

        FOR( n = 0; n < ivas_get_nchan_buffers_dec_fx( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate ); n++ )

        {

            set_zero_fx( st_ivas->p_output_fx[n], L_FRAME48k );

            st_ivas->hTcBuffer->tc_fx[n] = st_ivas->p_output_fx[n];

        }

        st_ivas->hTcBuffer->no_channels = ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate );

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

        move16();

    }
@@ -2627,7 +2627,7 @@ ivas_error ivas_jbm_dec_render_fx( 


    IF( st_ivas->hTcBuffer->n_samples_discard > 0 )

    {

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

        FOR( n = 0; n < s_min( MAX_OUTPUT_CHANNELS, ivas_get_nchan_buffers_dec_fx( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate ) ); n++ )

        {

            p_output_fx[n] += st_ivas->hTcBuffer->n_samples_discard;

        }

lib_dec/ivas_mc_paramupmix_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ void ivas_mc_paramupmix_dec_render( 


            ivas_mc_paramupmix_dec_sf( st_ivas, output_local_fx );



            Word16 num_ch = s_min( MAX_OUTPUT_CHANNELS, ivas_get_nchan_buffers_dec( st_ivas, -1, -1 ) );

            Word16 num_ch = s_min( MAX_OUTPUT_CHANNELS, ivas_get_nchan_buffers_dec_fx( st_ivas, -1, -1 ) );

            FOR( ch = 0; ch < num_ch; ch++ )

            {

                output_local_fx[ch] += n_samples_sf;

lib_dec/ivas_mct_dec_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -919,7 +919,7 @@ static ivas_error ivas_mc_dec_reconfig_fx( 
    move32();

    nchan_transport_old = st_ivas->nchan_transport;

    move16();

    nchan_out_buff_old = ivas_get_nchan_buffers_dec( st_ivas, -1, -1 );

    nchan_out_buff_old = ivas_get_nchan_buffers_dec_fx( st_ivas, -1, -1 );

    last_mc_mode = ivas_mc_mode_select_fx( ivas_mc_map_output_config_to_mc_ls_setup_fx( st_ivas->transport_config ), st_ivas->hDecoderConfig->last_ivas_total_brate ); /* NB: this assumes that LS config remains the same between frames */



    /* temporally set the current mc_mode back to the previous one to make sure the following call to
@@ -1645,7 +1645,7 @@ static ivas_error ivas_mc_dec_reconfig_fx( 
     * floating-point output audio buffers

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



    nchan_out_buff = ivas_get_nchan_buffers_dec_ivas_fx( st_ivas, -1, -1 );

    nchan_out_buff = ivas_get_nchan_buffers_dec_fx( st_ivas, -1, -1 );



    IF( NE_32( ( error = ivas_output_buff_dec_fx( st_ivas->p_output_fx, nchan_out_buff_old, nchan_out_buff ) ), IVAS_ERR_OK ) )

    {