Commit 7665986a authored by Nishant S Kulgod's avatar Nishant S Kulgod
Browse files

rebase #1

parent f70c9739

lib_com/ivas_cnst.h

+2 −2
Original line number Diff line number Diff line
@@ -1306,7 +1306,7 @@ enum 
#define MASA_COHERENCE_TOLERANCE                0.1f

#define MASA_COHERENCE_THRESHOLD                0.1f

#ifdef IVAS_FLOAT_FIXED

#define MASA_COHERENCE_TOLERANCE_FX             419430    // 0.1 in Q22

#define MASA_COHERENCE_TOLERANCE_FX             3277/*0.1 Q15*/

#define MASA_COHERENCE_THRESHOLD_FX             214748365 // 0.1 in Q31

#endif

#define MASA_RATIO_TOLERANCE                    0.1f
@@ -1314,7 +1314,7 @@ enum 
#define MASA_ANGLE_TOLERANCE                    0.5f

#ifdef IVAS_FLOAT_FIXED

#define MASA_RATIO_THRESHOLD_FX                 214748365   // 0.1 in Q31

#define MASA_RATIO_TOLERANCE_FX                 419430      // 0.1 in Q22

#define MASA_RATIO_TOLERANCE_FX                 214748364/*0.1 Q30*/

#define MASA_ANGLE_TOLERANCE_FX                 ONE_IN_Q21  // 0.5 in Q22

#endif

#define MASA_LIMIT_NO_BANDS_SUR_COH             8

lib_com/ivas_fb_mixer.c

+4 −0
Original line number Diff line number Diff line
@@ -387,6 +387,10 @@ ivas_error ivas_FB_mixer_open_fx( 
        move16();

    }



#ifdef MSAN_FIX

    set16_fx( hFbMixer->q_ppFilterbank_prior_input_fx, Q31, IVAS_MAX_FB_MIXER_IN_CH );

#endif



    test();

    IF( ( NE_16( fb_cfg->active_w_mixing, -1 ) ) && ( fb_cfg->num_out_chans > 0 ) )

    {

lib_com/ivas_prot.h

+2 −0
Original line number Diff line number Diff line
@@ -4646,11 +4646,13 @@ void ivas_spar_dec_upmixer( 
);



/* MD module */

#ifndef IVAS_FLOAT_FIXED

ivas_error ivas_spar_md_enc_open(

    ivas_spar_md_enc_state_t **hMdEnc,                          /* i/o: SPAR MD encoder handle                  */

    const ENCODER_CONFIG_HANDLE hEncoderConfig,                 /* i  : configuration structure                 */

    const int16_t sba_order                                     /* i  : Ambisonic (SBA) order                   */

);

#endif



void ivas_spar_md_enc_close(

    ivas_spar_md_enc_state_t **hMdEnc                           /* i/o: SPAR MD encoder handle                  */

lib_com/prot.h

+5 −3
Original line number Diff line number Diff line
@@ -5997,8 +5997,10 @@ float env_stab_smo( 














void core_switching_pre_enc(















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













#ifndef IVAS_FLOAT_FIXED















    const float *old_inp_12k8, /* i  : old input signal @12.8kHz               */















    const float *old_inp_16k,  /* i  : old input signal @16kHz                 */













#endif















    const int16_t active_cnt,       /* i  : Active frame counter                    */















    const int16_t last_element_mode /* i  : last_element_mode                       */















);

































lib_enc/acelp_core_enc.c



+1
−1




























Original line number
Diff line number
Diff line








@@ -753,7 +753,7 @@ ivas_error acelp_core_enc(













        Copy( hLPDmem->mem_syn, hLPDmem->mem_syn1_fx, M );































        /* update old synthesis buffer - needed for ACELP internal sampling rate switching */













        Copy( syn_fx + add( st->L_frame, L_SYN_MEM ), hLPDmem->mem_syn_r, L_SYN_MEM );













        Copy( syn_fx + sub( st->L_frame, L_SYN_MEM ), hLPDmem->mem_syn_r, L_SYN_MEM );































        Scale_sig( syn_fx, L_FRAME16k, sub( st->Q_syn, Q_new - 1 ) );















        /* save and delay synthesis to be used by SWB BWE */