Commit 169f7832 authored by vaclav's avatar vaclav
Browse files

update

parent 8deb552a

lib_dec/fd_cng_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -2011,7 +2011,7 @@ void generate_masking_noise_lb_dirac( 
            n_samples_start += hFdCngCom->frameSize;

        }



        /* move generated noise to the 5ms subframe starts in the tc buffer according to the output sampling frequency to avoid

        /* move generated noise to the 5ms subframe starts in the TC buffer according to the output sampling frequency to avoid

           overwriting it with the synthesis in case of shared tc and synth channel memory, i.e. non-TSM mode */

        slot_size_cng = hFdCngCom->frameSize / DEFAULT_JBM_CLDFB_TIMESLOTS;

        /* move start indices forward to the end of the last subframe */

lib_dec/ivas_ism_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
        ivas_output_init( &( st_ivas->hIntSetup ), st_ivas->hDecoderConfig->output_config );

    }



    /* transfer subframe info from DirAC or ParamMC to central tc buffer */

    /* transfer subframe info from DirAC or ParamMC to central TC buffer */

    /* only do this if we are not having done everything already in the TC decoding part and having only played out from the TC buffer */

    if ( last_ism_mode == ISM_MODE_PARAM && st_ivas->hSpatParamRendCom != NULL && st_ivas->hTcBuffer->tc_buffer_mode != TC_BUFFER_MODE_BUFFER )

    {
@@ -280,7 +280,7 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
    }



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

     * TC buffers

     * TC buffer

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



    int16_t tc_nchan_full_new;
@@ -318,7 +318,7 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
        st_ivas->hSpatParamRendCom->num_slots = hTcBuffer->num_slots;

        st_ivas->hSpatParamRendCom->slots_rendered = hTcBuffer->slots_rendered;



        mvs2s( st_ivas->hTcBuffer->subframe_nbslots, st_ivas->hSpatParamRendCom->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );

        mvs2s( hTcBuffer->subframe_nbslots, st_ivas->hSpatParamRendCom->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );

    }



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

lib_dec/ivas_jbm_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ void ivas_dec_feed_tc_to_renderer( 
        n_ch_res_copy = hTcBuffer->nchan_transport_rend - hTcBuffer->nchan_buffer_full;



        /* buffers are shared between 'hTcBuffer->tc[]' and 'p_output_f[]':

           in case of 'length(hTcBuffer->tc[]) < length(p_output_f[])', reset of TC buffers

           in case of 'length(hTcBuffer->tc[]) < length(p_output_f[])', reset of TC buffer

           pointers is needed after ivas_buffer_interleaved_to_deinterleaved() */

        len_offset = NS2SA( st_ivas->hDecoderConfig->output_Fs, MAX_JBM_L_FRAME_NS );

        if ( len_offset < L_FRAME48k )

lib_dec/ivas_masa_dec.c

+1 −2
Original line number Diff line number Diff line
@@ -1473,9 +1473,8 @@ ivas_error ivas_masa_dec_reconfigure( 
    ivas_masa_set_elements( ivas_total_brate, st_ivas->mc_mode, st_ivas->nchan_transport, st_ivas->hQMetaData, &tmp, &tmp, &tmp, st_ivas->ivas_format, st_ivas->ism_mode, ism_total_brate );



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

     * TC buffers

     * TC buffer

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



    {

        int16_t tc_nchan_to_allocate;

        int16_t tc_nchan_transport;

lib_dec/ivas_mc_paramupmix_dec.c

+3 −2
Original line number Diff line number Diff line
@@ -514,7 +514,8 @@ static void paramupmix_td_decorr_process( 


static void ivas_param_upmix_dec_decorr_subframes(

    Decoder_Struct *st_ivas,           /* i/o: IVAS decoder handle          */

    const int16_t nSamplesForRendering )

    const int16_t nSamplesForRendering /* i  : number of samples provided   */

)

{

    MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix;

    float *pPcm_tmp[MC_PARAMUPMIX_COMBINATIONS];