Reland "Upconvert various types to int.", neteq portion.

webrtc/modules/audio_coding/neteq/test/RTPencode.cc

 /*
  *  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 1543 matching lines @@
 
 int NetEQTest_encode(int coder,
                      int16_t* indata,
                      int frameLen,
                      unsigned char* encoded,
                      int sampleRate,
                      int* vad,
                      int useVAD,
                      int bitrate,
                      int numChannels) {
-  short cdlen = 0;
+  int cdlen = 0;
   int16_t* tempdata;
   static int first_cng = 1;
   int16_t tempLen;
 
   *vad = 1;
 
   // check VAD first
   if (useVAD) {
     *vad = 0;
 
@@ skipping 257 matching lines @@
     memmove(ptrL + stride, ptrL, ptrR - ptrL);
 
     // copy from temp to left pointer
     memcpy(ptrL, temp, stride);
 
     // advance pointers
     ptrL += stride * 2;
     ptrR += stride;
   }
 }