Commit ba152248 authored by Nishant S Kulgod's avatar Nishant S Kulgod
Browse files

commit 1

parent 6d6ab129

lib_com/ivas_prot.h

+3 −1
Original line number Diff line number Diff line
@@ -248,7 +248,8 @@ ivas_error pre_proc_front_ivas_fx( 
    const Word16 front_vad_dtx_flag,                           /* i  : front-VAD DTX flag to overwrite VAD decision*/

    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 */

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

    Word16 *Q_new

#ifdef DEBUG_MODE_INFO

    ,

    const Word16 ch_idx
@@ -422,6 +423,7 @@ ivas_error ivas_core_enc( 
    const int16_t n_CoreChannels,                                /* i  : number of core channels to be coded    */

    Word16 old_inp_12k8_fx[][L_INP_12k8],                            /* i  : buffer of old input signal             */

    Word16 old_inp_16k_fx[][L_INP],                                  /* i  : buffer of old input signal             */

    Word16 Q_new[],

    Word32 ener_fx[],                                            /* i  : residual energy from Levinson-Durbin Q6*/

    Word16 A_fx[][NB_SUBFR16k * ( M + 1 )],                      /* i  : A(z) unquantized for the 4 subframes   */

    Word16 Aw_fx[][NB_SUBFR16k * ( M + 1 )],                     /* i  : weighted A(z) unquantized for subframes*/

lib_com/ivas_prot_fx.h

+2 −1
Original line number Diff line number Diff line
@@ -864,7 +864,8 @@ void td_stereo_param_updt_fx( 
);



void updt_enc_common_ivas_fx(

    Encoder_State *st /* i/o: encoder state structure                     */

    Encoder_State *st, /* i/o: encoder state structure                     */

    const Word16 Q_new /* i  : CUrrent frame scaling       */

);

lib_com/prot_fx.h

+2 −1
Original line number Diff line number Diff line
@@ -10739,7 +10739,8 @@ void core_encode_update_ivas_fx( 
);















void updt_enc_common_ivas_fx(













    Encoder_State *st /* i/o: encoder state structure                     */













    Encoder_State *st, /* i/o: encoder state structure                     */













    const Word16 Q_new /* i  : CUrrent frame scaling       */















);





























// tools.c

























lib_enc/acelp_core_enc.c



+0
−2




























Original line number
Diff line number
Diff line








@@ -962,8 +962,6 @@ ivas_error acelp_core_enc(













            update_average_rate_fx( st->hSC_VBR, st->core_brate );















        }















    }













    st->prev_Q_new = Q_new;













    move16();















    pop_wmops();































    return error;

































lib_enc/ivas_core_enc.c



+3
−2




























Original line number
Diff line number
Diff line








@@ -60,6 +60,7 @@ ivas_error ivas_core_enc(













    const Word16 n_CoreChannels,                                     /* i  : number of core channels to be coded     */















    Word16 old_inp_12k8_fx[][L_INP_12k8],                            /* i  : buffer of old input signal              */















    Word16 old_inp_16k_fx[][L_INP],                                  /* i  : buffer of old input signal              */













    Word16 Q_new[],















    Word32 ener_fx[],                                                /* i  : residual energy from Levinson-Durbin Q6 */















    Word16 A_fx[][NB_SUBFR16k * ( M + 1 )],                          /* i  : A(z) unquantized for the 4 subframes    */















    Word16 Aw_fx[][NB_SUBFR16k * ( M + 1 )],                         /* i  : weighted A(z) unquantized for subframes */










@@ -90,7 +91,7 @@ ivas_error ivas_core_enc(













    Encoder_State **sts, *st;















    STEREO_ICBWE_ENC_HANDLE hStereoICBWE;















    STEREO_TD_ENC_DATA_HANDLE hStereoTD;













    Word16 Q_new[CPE_CHANNELS] = { 0 };













    //Word16 Q_new[CPE_CHANNELS] = { 0 };















    move16();















    move16();















    Word16 voice_factors_fx[CPE_CHANNELS][NB_SUBFR16k]; /* Q15 */










@@ -834,7 +835,7 @@ ivas_error ivas_core_enc(





























        IF( !MCT_flag ) /* for MCT do this later, otherwise there can be a problem because TCX quant happens later and might get the wrong last_core on a bit rate switch */















        {













            updt_enc_common_ivas_fx( st );













            updt_enc_common_ivas_fx( st, Q_new[n] );















        }































        IF( st->hBWE_FD != NULL )