Commit e8f262c8 authored by vaclav's avatar vaclav
Browse files

harmonization with basop

parent d32e83f3

lib_dec/ivas_sba_dirac_stereo_dec.c

+5 −2
Original line number Diff line number Diff line
@@ -837,6 +837,7 @@ void ivas_sba_dirac_stereo_dec( 
    int16_t dtx_flag, fd_cng_flag;

    int16_t sba_mono_flag;

    int16_t memOffset;

    int32_t output_Fs;

    float tmp_buf[NS2SA( 48000, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS )];

    float tmp_synth[L_FRAME16k];

    float hb_gain[NB_DIV];
@@ -849,6 +850,8 @@ void ivas_sba_dirac_stereo_dec( 
    int16_t mcmasa = st_ivas->ivas_format == MC_FORMAT;

#endif



    output_Fs = st_ivas->hDecoderConfig->output_Fs;



    hSCE = st_ivas->hSCE[0];

    hCPE = st_ivas->hCPE[0];

    hStereoDft = hCPE->hStereoDft;
@@ -868,7 +871,7 @@ void ivas_sba_dirac_stereo_dec( 
    memOffset = NS2SA( output_frame * FRAMES_PER_SEC, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS );



    ivas_sba_dirac_stereo_config( hStereoDft->hConfig );

    hStereoDft->nbands = ivas_sba_dirac_stereo_band_config( hStereoDft->band_limits, st_ivas->hDecoderConfig->output_Fs, hStereoDft->NFFT, ( ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT ) && !mcmasa ) );

    hStereoDft->nbands = ivas_sba_dirac_stereo_band_config( hStereoDft->band_limits, output_Fs, hStereoDft->NFFT, ( ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT ) && !mcmasa ) );

    stereo_dft_dec_update( hStereoDft, output_frame, 1 /*st_ivas->sba_dirac_stereo_flag*/ );

    if ( st_ivas->nchan_transport > 1 )

    {
@@ -901,7 +904,7 @@ void ivas_sba_dirac_stereo_dec( 


    /* DFT Stereo upmix */

    stereo_dft_dec( hStereoDft, hCPE->hCoreCoder[0], DFT, NULL, NULL, 1 /*st_ivas->sba_dirac_stereo_flag*/, sba_mono_flag, ( st_ivas->hSpar != NULL && !mcmasa ) ? st_ivas->hSpar->hMdDec : NULL, ( st_ivas->hSpar != NULL && !mcmasa ) ? st_ivas->hSpar->hFbMixer->cross_fade_start_offset : 0,

                    st_ivas->hDecoderConfig->output_Fs, st_ivas->nchan_transport, ivas_get_spar_dec_md_num_subframes( st_ivas->sba_order, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->last_active_ivas_total_brate ) );

                    output_Fs, st_ivas->nchan_transport, ivas_get_spar_dec_md_num_subframes( st_ivas->sba_order, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->last_active_ivas_total_brate ) );



    /* DFT synthesis */

    stereo_dft_dec_synthesize( hCPE, DFT, 0, output[0], output_frame );