Commit ae6313fd authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'scaling_changes_mld_fixes' into 'main' 

pre_proc_front scaling changes, Q documentation in lib_enc files

See merge request !887
parents e1432023 39dc7570

lib_com/ivas_cnst.h

+2 −1
Original line number Diff line number Diff line
@@ -1390,7 +1390,8 @@ typedef enum 
#define MCMASA_LFE_THETA_Q14                    (21299)   // Q14

#define MCMASA_LFE_QLOW_Q12                     (-26624)  // Q12

#define MCMASA_LFE_DELTA_Q11                    (2048)    // Q11



#define MCMASA_LFE_QLOW_Q11                     (-13312)  // Q11

#define MCMASA_LFE_DELTA_Q10                    (1024)    // Q10

#define NUM_ELEVATED_SPEAKERS                   4



#define MCMASA_MIN_SPEAKERS_SEPARATE_CENTER     4

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
@@ -408,6 +409,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

+12 −10
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       */

);
@@ -5812,8 +5813,8 @@ ivas_error ivas_cpe_enc_fx( 
    Word32 data_fx_ch1[],          /* i  : input signal for channel 1  Q(q_data_fx)   */

    Word16 q_data_fx,              /* i  : Q-factor of input signal for both channels */

    const Word16 input_frame,      /* i  : input frame length per channel             */

    const Word16 nb_bits_metadata /* i  : number of metadata bits                    */

);

    const Word16 nb_bits_metadata, /* i  : number of metadata bits                    */

    Word16 Q_new_out[] );



ivas_error ivas_mct_enc_fx(

    Encoder_Struct *st_ivas,           /* i/o: IVAS encoder structure            */
@@ -5839,7 +5840,8 @@ ivas_error ivas_compute_core_buffers_fx( 
    Word16 lsp_mid_fx[M],                  /* i/o: LSPs in the middle of the frame          */

    Word16 Q_old_inp_16k,

    Word16 Q_r[2],

    Word16 *Q_new );

    Word16 *Q_new,

    Word16 downscale_buf_speech_enc_pe );



ivas_error ivas_enc_fx(

    Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure      */

lib_com/prot_fx.h

+2 −1
Original line number Diff line number Diff line
@@ -10740,7 +10740,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;