Prepare to convert various types to size_t.

webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter.c

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 51 matching lines @@
                                int16_t* gainsQ12,
                                int16_t type) {
   int    k, ind, cnt;
   int16_t sign = 1;
   int16_t inystateQQ[PITCH_DAMPORDER];
   int16_t ubufQQ[PITCH_INTBUFFSIZE + QLOOKAHEAD];
   const int16_t Gain = 21299;     // 1.3 in Q14
   int16_t oldLagQ7;
   int16_t oldGainQ12, lagdeltaQ7, curLagQ7, gaindeltaQ12, curGainQ12;
   int indW32 = 0, frcQQ = 0;
-  int32_t tmpW32;
   const int16_t* fracoeffQQ = NULL;
 
   // Assumptions in ARM assembly for WebRtcIsacfix_PitchFilterCoreARM().
   COMPILE_ASSERT(PITCH_FRACORDER == 9);
   COMPILE_ASSERT(PITCH_DAMPORDER == 5);
 
   // Set up buffer and states.
   memcpy(ubufQQ, pfp->ubufQQ, sizeof(pfp->ubufQQ));
   memcpy(inystateQQ, pfp->ystateQQ, sizeof(inystateQQ));
 
@@ skipping 33 matching lines @@
 
     // Each frame has 4 60-sample pitch subframes, and each subframe has 5
     // 12-sample segments. Each segment need to be processed with
     // newly-updated parameters, so we break the pitch filtering into
     // two for-loops (5 x 12) below. It's also why kDivFactor = 0.2 (in Q15).
     for (cnt = 0; cnt < kSegments; cnt++) {
       // Update parameters for each segment.
       curGainQ12 += gaindeltaQ12;
       curLagQ7 += lagdeltaQ7;
       indW32 = CalcLrIntQ(curLagQ7, 7);
-      tmpW32 = (indW32 << 7) - curLagQ7;
-      frcQQ = (tmpW32 >> 4) + 4;
+      frcQQ = ((indW32 << 7) + 64 - curLagQ7) >> 4;
 
       if (frcQQ == PITCH_FRACS) {
         frcQQ = 0;
       }
       fracoeffQQ = kIntrpCoef[frcQQ];
 
       // Pitch filtering.
       WebRtcIsacfix_PitchFilterCore(PITCH_SUBFRAME_LEN / kSegments, curGainQ12,
         indW32, sign, inystateQQ, ubufQQ, fracoeffQQ, indatQQ, outdatQQ, &ind);
     }
@@ skipping 50 matching lines @@
 
     csum1QQ = 1;
     esumxQQ = 1;
 
     // Same as function WebRtcIsacfix_PitchFilter(), we break the pitch
     // filtering into two for-loops (5 x 12) below.
     for (cnt = 0; cnt < kSegments; cnt++) {
       // Update parameters for each segment.
       curLagQ7 += lagdeltaQ7;
       indW16 = (int16_t)CalcLrIntQ(curLagQ7, 7);
-      tmpW16 = (indW16 << 7) - curLagQ7;
-      frcQQ = (tmpW16 >> 4) + 4;
+      frcQQ = ((indW16 << 7) + 64 - curLagQ7) >> 4;
 
       if (frcQQ == PITCH_FRACS) {
         frcQQ = 0;
       }
       fracoeffQQ = kIntrpCoef[frcQQ];
 
       pos3QQ = pos - (indW16 + 4);
 
       for (n = 0; n < PITCH_SUBFRAME_LEN / kSegments; n++) {
         // Filter to get fractional pitch.
@@ skipping 36 matching lines @@
     }
     gainsQ12[k] = (int16_t)WEBRTC_SPL_SAT(PITCH_MAX_GAIN_Q12, tmpW32, 0);
   }
 
   // Export buffer and states.
   memcpy(pfp->ubufQQ, ubufQQ + PITCH_FRAME_LEN, sizeof(pfp->ubufQQ));
   pfp->oldlagQ7 = lagsQ7[PITCH_SUBFRAMES - 1];
   pfp->oldgainQ12 = gainsQ12[PITCH_SUBFRAMES - 1];
 
 }