Commit 2a1dbfab authored by vaillancour's avatar vaillancour
Browse files

missing modifications

parent efda00c4

lib_enc/ivas_core_pre_proc_front_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -1294,7 +1294,7 @@ ivas_error pre_proc_front_ivas_fx( 
                       corr_shift_fx, st->input_bwidth, st->max_band, hp_E_fx, MODE1, &( st->bckr_tilt_lt ), st->Opt_SC_VBR );

#ifdef FIX_2349_HARM_FIND_UV

    st->coder_type = find_uv_fx( st, pitch_fr_fx, voicing_fr_fx, inp_12k8_fx, ee_fx, &dE1X_fx, corr_shift_fx, *relE_fx, extract_h( Etot_fx ), hp_E_fx,

                                      &flag_spitch, last_core_orig, hStereoClassif, *Q_new /*q_inp_12k8*/, shift, fr_bands_fx_q ); // Q0

                                      &flag_spitch, last_core_orig, hStereoClassif, *Q_new, 0, fr_bands_fx_q ); // Q0

#else

    st->coder_type = find_uv_ivas_fx( st, pitch_fr_fx, voicing_fr_fx, inp_12k8_fx, ee_fx, &dE1X_fx, corr_shift_fx, *relE_fx, extract_h( Etot_fx ), hp_E_fx,

                                      &flag_spitch, last_core_orig, hStereoClassif, *Q_new /*q_inp_12k8*/, fr_bands_fx_q ); // Q0

lib_enc/prot_fx_enc.h

+7 −1
Original line number Diff line number Diff line
@@ -241,9 +241,12 @@ void find_tilt_fx( 
    Word32 *bckr_tilt_lt,    /* i/o: lf/hf E ratio of background noise                            Q16*/

    Word16 Opt_vbr_mode      /* Q0 */

);



#ifndef FIX_2349_HARM_FIND_UV

/* o  : coding type */

Word16 find_uv_ivas_fx(

#else

Word16 find_uv_fx(

#endif

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

    const Word16 *T_op_fr,                /* i  : pointer to adjusted fractional pitch (4 val.)                 Q6*/

    const Word16 *voicing_fr,             /* i  : refined correlation for each subframes                        Q15*/
@@ -258,8 +261,10 @@ Word16 find_uv_ivas_fx( 
    const Word16 last_core_orig,          /* i  : original last core                                            Q0*/

    STEREO_CLASSIF_HANDLE hStereoClassif, /* i/o: stereo classifier structure                                   */

    const Word16 Q_new,

    const Word16 shift,

    const Word16 q_hp_E );



#ifndef FIX_2349_HARM_FIND_UV

/* o  : coding type */

Word16 find_uv_fx(

    Encoder_State *st_fx,     /* i/o: encoder state structure                                              */
@@ -276,6 +281,7 @@ Word16 find_uv_fx( 
    const Word16 shift,

    const Word16 last_core_orig /* i  : original last core                                               Q0*/

);

#endif



void fine_gain_quant_fx(

    BSTR_ENC_HANDLE hBstr,   /* i/o: encoder bitstream handle                     */