Commit 6bb30ece authored by vaclav's avatar vaclav
Browse files

address reviewer's comments

parent e8f262c8

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ 
#define FIX_2287_MCT_MDCT_STEREO_DATA_MALLOC_SIZE       /* FhG: correct allocation size for STEREO_MDCT_DEC_DATA struct */

#define FIX_2271_OOB_INDEXING_IN_PIT_OL2                /* VA: Fix for issue 2271, to silence clang18 */

#define FIX_2273_OOB_INDEXING_IN_PIT_FR4                /* VA: Fix to silence clang on ptr init */

#define REMOVE_UNUSED_CODE_IVAS_DEC                     /* VA: remove unused code in ivas_jbm_dec_tc_fx() */()

#define REMOVE_UNUSED_CODE_IVAS_DEC                     /* VA: remove unused code in ivas_jbm_dec_tc_fx() */



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

lib_dec/ivas_sba_dirac_stereo_dec.c

+12 −1
Original line number Diff line number Diff line
@@ -837,7 +837,9 @@ void ivas_sba_dirac_stereo_dec( 
    int16_t dtx_flag, fd_cng_flag;

    int16_t sba_mono_flag;

    int16_t memOffset;

#ifdef REMOVE_UNUSED_CODE_IVAS_DEC

    int32_t output_Fs;

#endif

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

    float tmp_synth[L_FRAME16k];

    float hb_gain[NB_DIV];
@@ -848,9 +850,9 @@ void ivas_sba_dirac_stereo_dec( 
    STEREO_DFT_DEC_DATA_HANDLE hStereoDft;

#ifdef REMOVE_UNUSED_CODE_IVAS_DEC

    int16_t mcmasa = st_ivas->ivas_format == MC_FORMAT;

#endif



    output_Fs = st_ivas->hDecoderConfig->output_Fs;

#endif



    hSCE = st_ivas->hSCE[0];

    hCPE = st_ivas->hCPE[0];
@@ -871,7 +873,11 @@ 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 );

#ifdef REMOVE_UNUSED_CODE_IVAS_DEC

    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 ) );

#else

    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 ) );

#endif

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

    if ( st_ivas->nchan_transport > 1 )

    {
@@ -903,8 +909,13 @@ void ivas_sba_dirac_stereo_dec( 
    }



    /* DFT Stereo upmix */

#ifdef REMOVE_UNUSED_CODE_IVAS_DEC

    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,

                    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 ) );

#else

    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 ) );

#endif



    /* DFT synthesis */

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