Update a ton of audio code to use size_t more correctly and in general reduce

webrtc/modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.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.
  */
 
 // ReleaseTest-API.cpp : Defines the entry point for the console application.
 //
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <ctype.h>
 #include <iostream>
 
 /* include API */
 #include "isac.h"
 #include "utility.h"
+#include "webrtc/base/format_macros.h"
 
 /* Defines */
 #define SEED_FILE "randseed.txt" /* Used when running decoder on garbage data */
 #define MAX_FRAMESAMPLES 960     /* max number of samples per frame
                                     (= 60 ms frame & 16 kHz) or
                                     (= 30 ms frame & 32 kHz) */
 #define FRAMESAMPLES_10ms 160 /* number of samples per 10ms frame */
 #define SWBFRAMESAMPLES_10ms 320
 //#define FS 16000 /* sampling frequency (Hz) */
 
 #ifdef WIN32
 #define CLOCKS_PER_SEC 1000 /* Runtime statistics */
 #endif
 
 using namespace std;
 
 int main(int argc, char* argv[]) {
   char inname[100], outname[100], bottleneck_file[100], vadfile[100];
   FILE* inp, *outp, * f_bn = NULL, * vadp = NULL, *bandwidthp;
   int framecnt, endfile;
 
-  int i, errtype, VADusage = 0, packetLossPercent = 0;
+  size_t i;
+  int errtype, VADusage = 0, packetLossPercent = 0;
   int16_t CodingMode;
   int32_t bottleneck = 0;
   int framesize = 30; /* ms */
   int cur_framesmpls, err;
 
   /* Runtime statistics */
   double starttime, runtime, length_file;
 
-  int16_t stream_len = 0;
+  size_t stream_len = 0;
   int declen = 0, declenTC = 0;
   bool lostFrame = false;
 
   int16_t shortdata[SWBFRAMESAMPLES_10ms];
   int16_t vaddata[SWBFRAMESAMPLES_10ms * 3];
   int16_t decoded[MAX_FRAMESAMPLES << 1];
   int16_t decodedTC[MAX_FRAMESAMPLES << 1];
   uint16_t streamdata[500];
   int16_t speechType[1];
   int16_t rateBPS = 0;
   int16_t fixedFL = 0;
   int16_t payloadSize = 0;
   int32_t payloadRate = 0;
   int setControlBWE = 0;
   short FL, testNum;
   char version_number[20];
   FILE* plFile;
   int32_t sendBN;
 
 #ifdef _DEBUG
   FILE* fy;
   double kbps;
 #endif /* _DEBUG */
-  int totalbits = 0;
+  size_t totalbits = 0;
   int totalsmpls = 0;
 
   /* If use GNS file */
   FILE* fp_gns = NULL;
   char gns_file[100];
-  short maxStreamLen30 = 0;
-  short maxStreamLen60 = 0;
+  size_t maxStreamLen30 = 0;
+  size_t maxStreamLen60 = 0;
   short sampFreqKHz = 32;
   short samplesIn10Ms;
   short useAssign = 0;
   // FILE logFile;
   bool doTransCoding = false;
   int32_t rateTransCoding = 0;
   uint8_t streamDataTransCoding[1200];
-  int16_t streamLenTransCoding = 0;
+  size_t streamLenTransCoding = 0;
   FILE* transCodingFile = NULL;
   FILE* transcodingBitstream = NULL;
-  uint32_t numTransCodingBytes = 0;
+  size_t numTransCodingBytes = 0;
 
   /* only one structure used for ISAC encoder */
   ISACStruct* ISAC_main_inst = NULL;
   ISACStruct* decoderTransCoding = NULL;
 
   BottleNeckModel BN_data;
 
 #ifdef _DEBUG
   fy = fopen("bit_rate.dat", "w");
   fclose(fy);
@@ skipping 71 matching lines @@
   printf("iSAC version %s \n\n", version_number);
 
   /* Loop over all command line arguments */
   CodingMode = 0;
   testNum = 0;
   useAssign = 0;
   // logFile = NULL;
   char transCodingFileName[500];
   int16_t totFileLoop = 0;
   int16_t numFileLoop = 0;
-  for (i = 1; i + 2 < argc; i++) {
+  for (i = 1; i + 2 < static_cast<size_t>(argc); i++) {
     if (!strcmp("-LOOP", argv[i])) {
       i++;
       totFileLoop = (int16_t)atol(argv[i]);
       if (totFileLoop <= 0) {
         fprintf(stderr, "Invalid number of runs for the given input file, %d.",
                 totFileLoop);
         exit(0);
       }
     }
 
@@ skipping 373 matching lines @@
       /* Error check */
       if (err < 0) {
         errtype = WebRtcIsac_GetErrorCode(ISAC_main_inst);
         printf("\n\n Error in decoderinit: %d.\n\n", errtype);
         cout << flush;
       }
     }
 
     cur_framesmpls = 0;
     while (1) {
+      int stream_len_int = 0;
+
       /* Read 10 ms speech block */
       endfile = readframe(shortdata, inp, samplesIn10Ms);
 
       if (endfile) {
         numFileLoop++;
         if (numFileLoop < totFileLoop) {
           rewind(inp);
           framecnt = 0;
           fprintf(stderr, "\n");
           endfile = readframe(shortdata, inp, samplesIn10Ms);
         }
       }
 
       if (testNum == 7) {
         srand((unsigned int)time(NULL));
       }
 
       /* iSAC encoding */
       if (!(testNum == 3 && framecnt == 0)) {
-        stream_len =
+        stream_len_int =
             WebRtcIsac_Encode(ISAC_main_inst, shortdata, (uint8_t*)streamdata);
-        if ((payloadSize != 0) && (stream_len > payloadSize)) {
+        if ((payloadSize != 0) && (stream_len_int > payloadSize)) {
           if (testNum == 0) {
             printf("\n\n");
           }
 
           printf("\nError: Streamsize out of range %d\n",
-                 stream_len - payloadSize);
+                 stream_len_int - payloadSize);
           cout << flush;
         }
 
         WebRtcIsac_GetUplinkBw(ISAC_main_inst, &sendBN);
 
-        if (stream_len > 0) {
+        if (stream_len_int > 0) {
           if (doTransCoding) {
             int16_t indexStream;
             uint8_t auxUW8;
 
             /******************** Main Transcoding stream ********************/
             WebRtcIsac_GetDownLinkBwIndex(ISAC_main_inst, &bnIdxTC,
                                           &jitterInfoTC);
-            streamLenTransCoding = WebRtcIsac_GetNewBitStream(
+            int streamLenTransCoding_int = WebRtcIsac_GetNewBitStream(
                 ISAC_main_inst, bnIdxTC, jitterInfoTC, rateTransCoding,
                 streamDataTransCoding, false);
-            if (streamLenTransCoding < 0) {
+            if (streamLenTransCoding_int < 0) {
               fprintf(stderr, "Error in trans-coding\n");
               exit(0);
             }
+            streamLenTransCoding =
+                static_cast<size_t>(streamLenTransCoding_int);
             auxUW8 = (uint8_t)(((streamLenTransCoding & 0xFF00) >> 8) & 0x00FF);
             if (fwrite(&auxUW8, sizeof(uint8_t), 1, transcodingBitstream) !=
                 1) {
               return -1;
             }
 
             auxUW8 = (uint8_t)(streamLenTransCoding & 0x00FF);
             if (fwrite(&auxUW8, sizeof(uint8_t), 1, transcodingBitstream) !=
                 1) {
               return -1;
             }
 
             if (fwrite(streamDataTransCoding, sizeof(uint8_t),
                        streamLenTransCoding, transcodingBitstream) !=
-                static_cast<size_t>(streamLenTransCoding)) {
+                streamLenTransCoding) {
               return -1;
             }
 
             WebRtcIsac_ReadBwIndex(streamDataTransCoding, &indexStream);
             if (indexStream != bnIdxTC) {
               fprintf(stderr,
                       "Error in inserting Bandwidth index into transcoding "
                       "stream.\n");
               exit(0);
             }
             numTransCodingBytes += streamLenTransCoding;
           }
         }
       } else {
         break;
       }
 
-      if (stream_len < 0) {
+      if (stream_len_int < 0) {
         /* exit if returned with error */
         errtype = WebRtcIsac_GetErrorCode(ISAC_main_inst);
         fprintf(stderr, "Error in encoder: %d.\n", errtype);
         cout << flush;
         exit(0);
       }
+      stream_len = static_cast<size_t>(stream_len_int);
+
       cur_framesmpls += samplesIn10Ms;
       /* exit encoder loop if the encoder returned a bitstream */
       if (stream_len != 0)
         break;
     }
 
     /* read next bottleneck rate */
     if (f_bn != NULL) {
       if (fscanf(f_bn, "%d", &bottleneck) == EOF) {
         /* Set pointer to beginning of file */
@@ skipping 17 matching lines @@
     }
 
     if (!lostFrame) {
       lostFrame = ((rand() % 100) < packetLossPercent);
     } else {
       lostFrame = false;
     }
 
     // RED.
     if (lostFrame) {
-      stream_len = WebRtcIsac_GetRedPayload(
+      int stream_len_int = WebRtcIsac_GetRedPayload(
           ISAC_main_inst, reinterpret_cast<uint8_t*>(streamdata));
+      if (stream_len_int < 0) {
+        fprintf(stderr, "Error getting RED payload\n");
+        exit(0);
+      }
+      stream_len = static_cast<size_t>(stream_len_int);
 
       if (doTransCoding) {
-        streamLenTransCoding = WebRtcIsac_GetNewBitStream(
+        int streamLenTransCoding_int = WebRtcIsac_GetNewBitStream(
             ISAC_main_inst, bnIdxTC, jitterInfoTC, rateTransCoding,
             streamDataTransCoding, true);
-        if (streamLenTransCoding < 0) {
+        if (streamLenTransCoding_int < 0) {
           fprintf(stderr, "Error in RED trans-coding\n");
           exit(0);
         }
+        streamLenTransCoding =
+            static_cast<size_t>(streamLenTransCoding_int);
       }
     }
 
     /* make coded sequence to short be inreasing */
     /* the length the decoder expects */
     if (testNum == 4) {
       stream_len += 10;
     }
 
     /* make coded sequence to long be decreasing */
@@ skipping 157 matching lines @@
 #ifdef _DEBUG
     kbps = ((double)sampFreqKHz * 1000.) / ((double)cur_framesmpls) * 8.0 *
            stream_len / 1000.0;  // kbits/s
     fy = fopen("bit_rate.dat", "a");
     fprintf(fy, "Frame %i = %0.14f\n", framecnt, kbps);
     fclose(fy);
 
 #endif /* _DEBUG */
   }
   printf("\n");
-  printf("total bits               = %d bits\n", totalbits);
+  printf("total bits               = %" PRIuS " bits\n", totalbits);
   printf("measured average bitrate = %0.3f kbits/s\n",
          (double)totalbits * (sampFreqKHz) / totalsmpls);
   if (doTransCoding) {
     printf("Transcoding average bit-rate = %0.3f kbps\n",
            (double)numTransCodingBytes * 8.0 * (sampFreqKHz) / totalsmpls);
     fclose(transCodingFile);
   }
   printf("\n");
 
   /* Runtime statistics */
   runtime = (double)(clock() / (double)CLOCKS_PER_SEC - starttime);
   length_file = length_file / (sampFreqKHz * 1000.);
 
   printf("\n\nLength of speech file: %.1f s\n", length_file);
   printf("Time to run iSAC:      %.2f s (%.2f %% of realtime)\n\n", runtime,
          (100 * runtime / length_file));
 
   if (maxStreamLen30 != 0) {
-    printf("Maximum payload size 30ms Frames %d bytes (%0.3f kbps)\n",
+    printf("Maximum payload size 30ms Frames %" PRIuS " bytes (%0.3f kbps)\n",
            maxStreamLen30, maxStreamLen30 * 8 / 30.);
   }
   if (maxStreamLen60 != 0) {
-    printf("Maximum payload size 60ms Frames %d bytes (%0.3f kbps)\n",
+    printf("Maximum payload size 60ms Frames %" PRIuS " bytes (%0.3f kbps)\n",
            maxStreamLen60, maxStreamLen60 * 8 / 60.);
   }
   // fprintf(stderr, "\n");
 
   fprintf(stderr, "   %.1f s", length_file);
   fprintf(stderr, "   %0.1f kbps",
           (double)totalbits * (sampFreqKHz) / totalsmpls);
   if (maxStreamLen30 != 0) {
-    fprintf(stderr, "   plmax-30ms %d bytes (%0.0f kbps)", maxStreamLen30,
-            maxStreamLen30 * 8 / 30.);
+    fprintf(stderr, "   plmax-30ms %" PRIuS " bytes (%0.0f kbps)",
+            maxStreamLen30, maxStreamLen30 * 8 / 30.);
   }
   if (maxStreamLen60 != 0) {
-    fprintf(stderr, "   plmax-60ms %d bytes (%0.0f kbps)", maxStreamLen60,
-            maxStreamLen60 * 8 / 60.);
+    fprintf(stderr, "   plmax-60ms %" PRIuS " bytes (%0.0f kbps)",
+            maxStreamLen60, maxStreamLen60 * 8 / 60.);
   }
   if (doTransCoding) {
     fprintf(stderr, "  transcoding rate %.0f kbps",
             (double)numTransCodingBytes * 8.0 * (sampFreqKHz) / totalsmpls);
   }
 
   fclose(inp);
   fclose(outp);
   WebRtcIsac_Free(ISAC_main_inst);
 
   exit(0);
 }