Commit a70efa7e authored by vaclav's avatar vaclav
Browse files

address reviewer's comment

parent 36511928

lib_enc/pitch_ol_fx.c

+14 −9
Original line number Diff line number Diff line
@@ -1132,23 +1132,25 @@ void pitch_ol_ivas_fx( 
    Word16 i, j, k, m, pit_min, pit_min1, sect0, subsect0, old_tmp, old_tmp1, len_x, len_x1;

    Word16 len_temp;

    Word16 pitchX[NHFR][2 * NSECT];



    Word16 enr0_exp[NSECT], enr0_1_exp[NSECT], enr1_exp;

    Word32 enr0[NSECT], enr0_1[NSECT], enr1;

    Word64 temp, temp1;

    Word32 Ltmp;

    Word16 tmp16, tmp16_2;

    Word16 scaledX[NHFR][2 * NSECT], corX[NHFR][2 * NSECT];



    const Word16 *len, *len1, *sublen, *sublen1, *pit_max, *sec_length, *sec_length1;



    const Word16 *nb_sect, *nb_subsect, *len, *len1, *sublen, *sublen1, *pit_max, *sec_length, *sec_length1;

    Word16 pit_min_coding;

    Word16 new_q;



    new_q = sub( 63, shl( qwsp, 1 ) );



    /*--------------------------------------------------------------*

     * Initialization

     *--------------------------------------------------------------*/



    nb_sect = nb_sect_12k8;

    nb_subsect = nb_subsect_12k8;



    len = len_12k8;

    len1 = len1_12k8;

    sublen = sublen_12k8;
@@ -1293,12 +1295,15 @@ void pitch_ol_ivas_fx( 
        pt_cor3 = pt_cor0 + ( DELTA_COH - 1 ) + len_x;

        pt_cor3_exp = pt_cor0_exp + ( DELTA_COH - 1 ) + len_x;



        IF( LT_16( i, NHFR - 1 ) ) /* First two half-frames (current frame) */

        /*-----------------------------------------------------------------*

         * First two half-frames (corresponding to current frame)

         *-----------------------------------------------------------------*/

        IF( LT_16( i, NHFR - 1 ) )

        {

            pt3 = pt1;

            pt5 = pt1;



            FOR( j = sect0; j < NSECT; j++ ) /* loop for each section */

            FOR( j = sect0; j < nb_sect[i]; j++ ) /* loop for each section */

            {

                /*-----------------------------------------------------------------*

                 * Find fixed vector energy
@@ -1389,7 +1394,7 @@ void pitch_ol_ivas_fx( 
             * For each subsection, find the correlation

             *----------------------------------------------------------*/



            FOR( j = subsect0; j < NSUBSECT; j++ )

            FOR( j = subsect0; j < nb_subsect[i]; j++ )

            {

                len_temp = sublen[j];

                move16();
@@ -1475,7 +1480,7 @@ void pitch_ol_ivas_fx( 
             * For each section in both sets, find fixed vector energy

             *-----------------------------------------------------------------*/



            FOR( j = sect0; j < NSECT; j++ ) /* loop for each section */

            FOR( j = sect0; j < nb_sect[i]; j++ ) /* loop for each section */

            {

                /* 1st set */

                k = (Word16) ( pt3 - pt6 );
@@ -1574,7 +1579,7 @@ void pitch_ol_ivas_fx( 
             * For each subsection, find the correlation (overlapping pitch lag values)

             *-----------------------------------------------------------------*/



            FOR( j = subsect0; j < NSUBSECT; j++ )

            FOR( j = subsect0; j < nb_subsect; j++ )

            {

                k = sub( pit_max[j + 1], pit_max[j] );