Update audio code to use size_t more correctly,

webrtc/modules/audio_coding/codecs/isac/main/test/simpleKenny.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.
  */
 
 /* kenny.c  - Main function for the iSAC coder */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
 #ifdef WIN32
 #include "windows.h"
 #define CLOCKS_PER_SEC 1000
 #endif
 
 #include <ctype.h>
 #include <math.h>
 
 /* include API */
 #include "isac.h"
 #include "utility.h"
+#include "webrtc/base/format_macros.h"
 //#include "commonDefs.h"
 
 /* max number of samples per frame (= 60 ms frame) */
 #define MAX_FRAMESAMPLES_SWB 1920
 /* number of samples per 10ms frame */
 #define FRAMESAMPLES_SWB_10ms 320
 #define FRAMESAMPLES_WB_10ms 160
 
 /* sampling frequency (Hz) */
 #define FS_SWB 32000
@@ skipping 11 matching lines @@
 int main(int argc, char* argv[]) {
   //--- File IO ----
   FILE* inp;
   FILE* outp;
   char inname[500];
   char outname[500];
 
   /* Runtime statistics */
   double rate;
   double rateRCU;
-  unsigned long totalbits = 0;
+  size_t totalbits = 0;
   unsigned long totalBitsRCU = 0;
   unsigned long totalsmpls = 0;
 
   int32_t bottleneck = 39;
   int frameSize = 30; /* ms */
   int16_t codingMode = 1;
   int16_t shortdata[FRAMESAMPLES_SWB_10ms];
   int16_t decoded[MAX_FRAMESAMPLES_SWB];
   // uint16_t  streamdata[1000];
   int16_t speechType[1];
   int16_t payloadLimit;
   int32_t rateLimit;
   ISACStruct* ISAC_main_inst;
 
-  int16_t stream_len = 0;
+  size_t stream_len = 0;
   int declen = 0;
   int16_t err;
   int cur_framesmpls;
   int endfile;
 #ifdef WIN32
   double length_file;
   double runtime;
   char outDrive[10];
   char outPath[500];
   char outPrefix[500];
   char outSuffix[500];
   char bitrateFileName[500];
   FILE* bitrateFile;
   double starttime;
   double rateLB = 0;
   double rateUB = 0;
 #endif
   FILE* histFile;
   FILE* averageFile;
   int sampFreqKHz;
   int samplesIn10Ms;
-  int16_t maxStreamLen = 0;
+  size_t maxStreamLen = 0;
   char histFileName[500];
   char averageFileName[500];
   unsigned int hist[600];
   double tmpSumStreamLen = 0;
   unsigned int packetCntr = 0;
   unsigned int lostPacketCntr = 0;
   uint8_t payload[1200];
   uint8_t payloadRCU[1200];
   uint16_t packetLossPercent = 0;
   int16_t rcuStreamLen = 0;
@@ skipping 195 matching lines @@
 
   while (endfile == 0) {
     fprintf(stderr, "  \rframe = %7li", framecnt);
 
     //============== Readind from the file and encoding =================
     cur_framesmpls = 0;
     stream_len = 0;
 
     if (onlyDecode) {
       uint8_t auxUW8;
-      size_t auxSizet;
       if (fread(&auxUW8, sizeof(uint8_t), 1, inp) < 1) {
         break;
       }
-      stream_len = ((uint8_t)auxUW8) << 8;
+      stream_len = auxUW8 << 8;
       if (fread(&auxUW8, sizeof(uint8_t), 1, inp) < 1) {
         break;
       }
-      stream_len |= (uint16_t)auxUW8;
-      auxSizet = (size_t)stream_len;
-      if (fread(payload, 1, auxSizet, inp) < auxSizet) {
+      stream_len |= auxUW8;
+      if (fread(payload, 1, stream_len, inp) < stream_len) {
         printf("last payload is corrupted\n");
         break;
       }
     } else {
       while (stream_len == 0) {
+        int stream_len_int;
+
         // Read 10 ms speech block
         endfile = readframe(shortdata, inp, samplesIn10Ms);
         if (endfile) {
           break;
         }
         cur_framesmpls += samplesIn10Ms;
 
         //-------- iSAC encoding ---------
-        stream_len = WebRtcIsac_Encode(ISAC_main_inst, shortdata, payload);
+        stream_len_int = WebRtcIsac_Encode(ISAC_main_inst, shortdata, payload);
 
-        if (stream_len < 0) {
+        if (stream_len_int < 0) {
           // exit if returned with error
           // errType=WebRtcIsac_GetErrorCode(ISAC_main_inst);
           fprintf(stderr, "\nError in encoder\n");
           getc(stdin);
           exit(EXIT_FAILURE);
         }
+        stream_len = (size_t)stream_len_int;
       }
       //===================================================================
       if (endfile) {
         break;
       }
 
       rcuStreamLen = WebRtcIsac_GetRedPayload(ISAC_main_inst, payloadRCU);
       if (rcuStreamLen < 0) {
         fprintf(stderr, "\nError getting RED payload\n");
         getc(stdin);
@@ skipping 33 matching lines @@
       uint8_t auxUW8;
       auxUW8 = (uint8_t)(((stream_len & 0x7F00) >> 8) & 0xFF);
       if (fwrite(&auxUW8, sizeof(uint8_t), 1, outp) != 1) {
         return -1;
       }
 
       auxUW8 = (uint8_t)(stream_len & 0xFF);
       if (fwrite(&auxUW8, sizeof(uint8_t), 1, outp) != 1) {
         return -1;
       }
-      if (fwrite(payload, 1, stream_len, outp) != (size_t)stream_len) {
+      if (fwrite(payload, 1, stream_len, outp) != stream_len) {
         return -1;
       }
     } else {
       //======================= iSAC decoding ===========================
 
       if ((rand() % 100) < packetLossPercent) {
-        declen = WebRtcIsac_DecodeRcu(ISAC_main_inst, payloadRCU, rcuStreamLen,
-                                      decoded, speechType);
+        declen = WebRtcIsac_DecodeRcu(ISAC_main_inst, payloadRCU,
+                                      (size_t)rcuStreamLen, decoded,
+                                      speechType);
         lostPacketCntr++;
       } else {
         declen = WebRtcIsac_Decode(ISAC_main_inst, payload, stream_len, decoded,
                                    speechType);
       }
       if (declen <= 0) {
         // errType=WebRtcIsac_GetErrorCode(ISAC_main_inst);
         fprintf(stderr, "\nError in decoder.\n");
         getc(stdin);
         exit(1);
@@ skipping 33 matching lines @@
 #endif
 
   fprintf(bitrateFile, "%d  %10u     %d     %6.3f  %6.3f    %6.3f\n",
           sampFreqKHz, framecnt, bottleneck, rateLB, rateUB, rate);
   fclose(bitrateFile);
 #endif  // WIN32
 
   printf("\n");
   printf("Measured bit-rate........... %0.3f kbps\n", rate);
   printf("Measured RCU bit-ratre...... %0.3f kbps\n", rateRCU);
-  printf("Maximum bit-rate/payloadsize %0.3f / %d\n",
+  printf("Maximum bit-rate/payloadsize %0.3f / %" PRIuS "\n",
          maxStreamLen * 8 / 0.03, maxStreamLen);
   printf("Measured packet-loss........ %0.1f%% \n",
          100.0f * (float)lostPacketCntr / (float)packetCntr);
 
   // #ifdef HAVE_DEBUG_INFO
   // printf("Measured lower-band bit-rate %0.3f kbps (%.0f%%)\n",
   //        rateLB, (double)(rateLB) * 100. /(double)(rate));
   // printf("Measured upper-band bit-rate %0.3f kbps (%.0f%%)\n",
   //        rateUB, (double)(rateUB) * 100. /(double)(rate));
   //
@@ skipping 95 matching lines @@
   str->lastArrivalTime = 0;
 
   str->maxPayloadLB = 0;
   str->maxPayloadUB = 0;
   str->lbBytes = 0;
   str->ubBytes = 0;
 
   return 0;
 };
 #endif