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

webrtc/modules/audio_coding/codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.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 173 matching lines @@
         printf("Could not setup bottleneck and frame-size for client %d\n",
                clientCntr + 1);
         return -1;
       }
     }
   }
 
 
   short streamLen;
   short numSamplesRead;
-  short lenDecodedAudio;
+  int lenDecodedAudio;
   short senderIdx;
   short receiverIdx;
 
   printf("\n");
   short num10ms[MAX_NUM_CLIENTS];
   memset(num10ms, 0, sizeof(short)*MAX_NUM_CLIENTS);
   FILE* arrivalTimeFile1 = fopen("arrivalTime1.dat", "wb");
   FILE* arrivalTimeFile2 = fopen("arrivalTime2.dat", "wb");
   short numPrint[MAX_NUM_CLIENTS];
   memset(numPrint, 0, sizeof(short) * MAX_NUM_CLIENTS);
@@ skipping 249 matching lines @@
             return -1;
           }
         }
         num10ms[senderIdx] = 0;
       }
       //}
       //}
     }
   }
 }