Commit e0f31ab8 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

review comments

parent 90878c96

lib_com/ivas_prot.h

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ ivas_error pre_proc_front_ivas_fx( 
    const IVAS_FORMAT ivas_format,                             /* i  : IVAS format                              */

    const Word16 MCT_flag,                                     /* i  : hMCT handle allocated (1) or not (0)    */

    const Word32 ivas_total_brate                              /* i  : IVAS total bitrate - for setting the DTX */

#ifdef DEBUG_MODE_INFO_CORE_CODER_IN

#ifdef DEBUG_MODE_INFO

    ,

    const Word16 ch_idx

#endif

lib_com/options.h

+0 −5
Original line number Diff line number Diff line
@@ -51,11 +51,6 @@ 
#define DEBUG_MODE_INFO_TWEAK                 /* Enable command line switch to specify subdirectory for debug info output inside "./res/" */

#define DEBUG_FORCE_MDCT_STEREO_MODE      /* Force stereo mode decision for MDCT stereo: -stereo 3 1 forces L/R coding and -stereo 3 2 forces full M/S coding */

/*#define DBG_WAV_WRITER*/                    /* Enable dbgwrite_wav() function for generating ".wav" files */

#ifdef DEBUG_MODE_INFO

#ifdef DEBUG_MODE_INFO_TWEAK

#define DEBUG_MODE_INFO_CORE_CODER_IN        /*dump core coder input*/

#endif

#endif

#endif



#define SUPPORT_JBM_TRACEFILE                   /* Support for JBM tracefile, which is needed for 3GPP objective/subjective testing, but not relevant for real-world implementations */

lib_enc/ivas_core_pre_proc_front.c

+5 −5
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ ivas_error pre_proc_front_ivas_fx( 
    const IVAS_FORMAT ivas_format,   /* i  : IVAS format                              */

    const Word16 MCT_flag,           /* i  : hMCT handle allocated (1) or not (0)    */

    const Word32 ivas_total_brate    /* i  : IVAS total bitrate - for setting the DTX */

#ifdef DEBUG_MODE_INFO_CORE_CODER_IN

#ifdef DEBUG_MODE_INFO

    ,

    const Word16 ch_idx

#endif
@@ -1044,7 +1044,7 @@ ivas_error pre_proc_front_ivas_fx( 
    Word16 imagBuffer16[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];

    Word16 res_cod_SNR_M_fx_e[STEREO_DFT_BAND_MAX];

    Word16 band_energies_fx_exp, Qfact_PS, q_lf_E_fx;

#ifdef DEBUG_MODE_INFO_CORE_CODER_IN

#ifdef DEBUG_MODE_INFO

    Word32 *in_buff_temp;

    Word16 in_q_temp;

#endif
@@ -1066,7 +1066,7 @@ ivas_error pre_proc_front_ivas_fx( 
        hSCE->hCoreCoder[n]->q_old_inp = -1;

        move16();



#ifdef DEBUG_MODE_INFO_CORE_CODER_IN

#ifdef DEBUG_MODE_INFO

        in_buff_temp = hSCE->hCoreCoder[n]->input32_fx;

        in_q_temp = hSCE->hCoreCoder[n]->q_inp32;

#endif
@@ -1083,13 +1083,13 @@ ivas_error pre_proc_front_ivas_fx( 
        Scale_sig( hCPE->hCoreCoder[n]->old_input_signal_fx, input_frame, sub( -1, hCPE->hCoreCoder[n]->q_old_inp ) );

        hCPE->hCoreCoder[n]->q_old_inp = -1;

        move16();

#ifdef DEBUG_MODE_INFO_CORE_CODER_IN

#ifdef DEBUG_MODE_INFO

        in_buff_temp = hCPE->hCoreCoder[n]->input32_fx;

        in_q_temp = hCPE->hCoreCoder[n]->q_inp32;

#endif

    }



#ifdef DEBUG_MODE_INFO_CORE_CODER_IN

#ifdef DEBUG_MODE_INFO

    {

        int16_t tmpF[L_FRAME48k];

        for ( int16_t isample = 0; isample < input_frame; isample++ )

lib_enc/ivas_cpe_enc.c

+2 −2
Original line number Diff line number Diff line
@@ -857,9 +857,9 @@ ivas_error ivas_cpe_enc_fx( 
                                        realBuffer_fx[n], imagBuffer_fx[n], &q_re_im_buf[n], old_wsp_fx[n], &q_old_wsp, pitch_fr_fx[n], voicing_fr_fx[n], &loc_harm[n], &cor_map_sum_fx[n], &vad_flag_dtx[n], enerBuffer_fx[n], &enerBuffer_fx_exp[n],

                                        fft_buff_fx[n], &fft_buff_fx_q[n], A_fx[0], lsp_new_fx[0], currFlatness_fx[n], tdm_ratio_idx, fr_bands_fx, add( Q_buffer[n], QSCALE ), Etot_LR_fx, lf_E_fx, add( Q_buffer[n], QSCALE - 2 ), localVAD_HE_SAD,

                                        band_energies_LR_fx, sub( add( Q_buffer[n], QSCALE ), band_ener_guardbits ), 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_flag : 0, 0, 0, ivas_format, st_ivas->hMCT != NULL, ivas_total_brate

#ifdef DEBUG_MODE_INFO_CORE_CODER_IN

#ifdef DEBUG_MODE_INFO

                                        ,

                                        ( ( cpe_id * CPE_CHANNELS ) + n )

                                        ( st_ivas->nSCE + ( cpe_id * CPE_CHANNELS ) + n )

#endif

        );

        e_old_wsp[n] = sub( Q15, q_old_wsp );

lib_enc/ivas_ism_enc.c

+2 −2
Original line number Diff line number Diff line
@@ -610,9 +610,9 @@ ivas_error ivas_ism_enc_fx( 
                                        &ener_fx[sce_id][0], &relE_fx[sce_id][0], A_fx[sce_id][0], Aw_fx[sce_id][0], epsP_fx[sce_id][0], &epsP_fx_q[sce_id][0], lsp_new_fx[sce_id][0], lsp_mid_fx[sce_id][0], &vad_hover_flag[sce_id][0], &attack_flag[sce_id][0],

                                        realBuffer_fx[sce_id][0], imagBuffer_fx[sce_id][0], &q_re_im_buf[sce_id], old_wsp_fx[sce_id][0], &q_old_wsp, pitch_fr_fx[sce_id][0], voicing_fr_fx[sce_id][0], &loc_harm[sce_id][0], &cor_map_sum_fx[sce_id][0], &vad_flag_dtx[sce_id][0], enerBuffer_fx[sce_id][0], &enerBuffer_fx_exp[sce_id][0],

                                        fft_buff_fx[sce_id][0], &fft_buff_fx_q[sce_id][0], A_fx[sce_id][0], lsp_new_fx[sce_id][0], currFlatness_fx[0], 0, fr_bands_fx, 31, Etot_LR_fx, lf_E_fx, 31, localVAD_HE_SAD, NULL, 31, 0, 0, 0, 0, ISM_FORMAT, 0, st_ivas->hEncoderConfig->ivas_total_brate

#ifdef DEBUG_MODE_INFO_CORE_CODER_IN

#ifdef DEBUG_MODE_INFO

                                        ,

                                        sce_id

                                        st->id_element

#endif

        );

        e_old_wsp[sce_id][0] = sub( Q15, q_old_wsp );