Commit 1156eb33 authored by Nishant S Kulgod's avatar Nishant S Kulgod
Browse files

rebase #2

parent 2d77a1fc

lib_com/cb_shape_fx.c

+9 −10
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static void E_GAIN_f_pitch_sharpening( Word16 *x, Word16 pit_lag, Word16 L_subfr 
    FOR( i = pit_lag; i < L_subfr; i++ )

    {

        /*x[i] += x[i - pit_lag] * F_PIT_SHARP;*/

        tmp = mult_r( x[sub( i, pit_lag )], 27853 /*F_PIT_SHARP Q15*/ );

        tmp = mult_r( x[i - pit_lag], 27853 /*F_PIT_SHARP Q15*/ );

        x[i] = add( x[i], tmp );

        move16();

    }
@@ -47,12 +47,12 @@ void cb_shape_fx( 
    const Word16 scramblingFlag,  /* i  : flag for phase scrambling                       */

    const Word16 sharpFlag,       /* i  : flag for formant sharpening                     */

    const Word16 formantTiltFlag, /* i  : flag for formant tilt                           */

    const Word16 g1,              /* i  : formant sharpening numerator weighting          */

    const Word16 g2,              /* i  : formant sharpening denominator weighting        */

    const Word16 *p_Aq,           /* i  : LP filter coefficients                          */

    Word16 *code,                 /* i/o: signal to shape                                 */

    const Word16 tilt_code,       /* i  : tilt of code                                    */

    const Word16 pt_pitch,        /* i  : pointer to current subframe fractional pitch    */

    const Word16 g1,              /* i  : formant sharpening numerator weighting     Q15     */

    const Word16 g2,              /* i  : formant sharpening denominator weighting   Q15     */

    const Word16 *p_Aq,           /* i  : LP filter coefficients                     Q12     */

    Word16 *code,                 /* i/o: signal to shape                            Q9      */

    const Word16 tilt_code,       /* i  : tilt of code                               Q15     */

    const Word16 pt_pitch,        /* i  : pointer to current subframe fractional pitch Q6   */

    const Word16 shift,

    const Word16 L_subfr /* i  : subframe lenght */

)
@@ -88,8 +88,8 @@ void cb_shape_fx( 
            buff[i] = code[i];

            move16();

            /*code[i] = 0.7f*buff[i] + buff[i-1] - 0.7f*code[i-1];      */

            L_tmp = L_mult( 22938, buff[i] );

            tmp = mac_r( L_tmp, -22938, code[i - 1] );

            L_tmp = L_mult( 22938 /*.7f in Q15*/, buff[i] );           // Q15+Q9+1

            tmp = mac_r( L_tmp, -22938 /*-.7f in Q15*/, code[i - 1] ); // Q9

            code[i] = add( tmp, buff[i - 1] );

            move16();

        }
@@ -121,7 +121,6 @@ void cb_shape_fx( 
        {

            Copy( code, buff, L_subfr );



            move16();

            Residu3_lc_fx( A_num, M, buff, code, L_subfr, shift );

            {

                syn_filt_s_lc_fx( shift, A_den, code, code, L_subfr );

lib_com/cldfb.c

+330 −302

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/cldfb_evs.c

+119 −114

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/fft_evs.c

+37 −37

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/fft_fx.c

+887 −866

File changed.

Preview size limit exceeded, changes collapsed.