Update audio code to use size_t more correctly,

webrtc/modules/audio_coding/codecs/isac/fix/test/test_iSACfixfloat.c

 /*
  *  Copyright (c) 2011 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.
  */
 
 /*
  * test_iSACfixfloat.c
  *
  * Test compatibility and quality between floating- and fixed-point code
  * */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 /* include API */
 #include "isac.h"
 #include "isacfix.h"
+#include "webrtc/base/format_macros.h"
 
 /* max number of samples per frame (= 60 ms frame) */
 #define MAX_FRAMESAMPLES 960
 /* number of samples per 10ms frame */
 #define FRAMESAMPLES_10ms 160
 /* sampling frequency (Hz) */
 #define FS 16000
 
 /* Runtime statistics */
 #include <time.h>
@@ skipping 16 matching lines @@
 }
 
 typedef struct {
   uint32_t send_time;    /* samples */
   uint32_t arrival_time; /* samples */
   uint32_t sample_count; /* samples */
   uint16_t rtp_number;
 } BottleNeckModel;
 
 void get_arrival_time(int current_framesamples, /* samples */
-                      int packet_size,          /* bytes */
+                      size_t packet_size,       /* bytes */
                       int bottleneck,           /* excluding headers; bits/s */
                       BottleNeckModel* BN_data) {
   const int HeaderSize = 35;
   int HeaderRate;
 
   HeaderRate = HeaderSize * 8 * FS / current_framesamples; /* bits/s */
 
   /* everything in samples */
   BN_data->sample_count = BN_data->sample_count + current_framesamples;
 
@@ skipping 20 matching lines @@
   int framesize = 30; /* ms */
   // int framesize = 60; /* To invoke cisco complexity case at frame 2252 */
 
   int cur_framesmpls, err;
 
   /* Runtime statistics */
   double starttime;
   double runtime;
   double length_file;
 
-  int16_t stream_len = 0;
+  size_t stream_len = 0;
   int declen;
 
   int16_t shortdata[FRAMESAMPLES_10ms];
   int16_t decoded[MAX_FRAMESAMPLES];
   uint16_t streamdata[600];
   int16_t speechType[1];
 
   // int16_t* iSACstruct;
 
   char version_number[20];
   int mode = -1, tmp, nbTest = 0; /*,sss;*/
 
 #ifdef _DEBUG
   FILE* fy;
   double kbps;
-  int totalbits = 0;
+  size_t totalbits = 0;
   int totalsmpls = 0;
 #endif /* _DEBUG */
 
   /* only one structure used for ISAC encoder */
   ISAC_MainStruct* ISAC_main_inst;
   ISACFIX_MainStruct* ISACFIX_main_inst;
 
   BottleNeckModel BN_data;
   f_bn = NULL;
 
@@ skipping 257 matching lines @@
     fclose(inp);
     fclose(outp);
     fclose(bitsp);
     return (EXIT_FAILURE);
   }
 #endif
 
   while (endfile == 0) {
     cur_framesmpls = 0;
     while (1) {
+      int stream_len_int;
+
       /* Read 10 ms speech block */
       if (nbTest != 1)
         endfile = readframe(shortdata, inp, FRAMESAMPLES_10ms);
       else
         endfile = readframe(shortdata, inp, (FRAMESAMPLES_10ms / 2));
 
       /* iSAC encoding */
 
       if (mode == 0 || mode == 1) {
-        stream_len =
+        stream_len_int =
             WebRtcIsac_Encode(ISAC_main_inst, shortdata, (uint8_t*)streamdata);
-        if (stream_len < 0) {
+        if (stream_len_int < 0) {
           /* exit if returned with error */
           errtype = WebRtcIsac_GetErrorCode(ISAC_main_inst);
           printf("\n\nError in encoder: %d.\n\n", errtype);
           // exit(EXIT_FAILURE);
         }
       } else if (mode == 2 || mode == 3) {
         /* iSAC encoding */
         if (nbTest != 1) {
-          stream_len = WebRtcIsacfix_Encode(ISACFIX_main_inst, shortdata,
-                                            (uint8_t*)streamdata);
+          stream_len_int = WebRtcIsacfix_Encode(ISACFIX_main_inst, shortdata,
+                                                (uint8_t*)streamdata);
         } else {
-          stream_len =
+          stream_len_int =
               WebRtcIsacfix_EncodeNb(ISACFIX_main_inst, shortdata, streamdata);
         }
 
-        if (stream_len < 0) {
+        if (stream_len_int < 0) {
           /* exit if returned with error */
           errtype = WebRtcIsacfix_GetErrorCode(ISACFIX_main_inst);
           printf("\n\nError in encoder: %d.\n\n", errtype);
           // exit(EXIT_FAILURE);
         }
       }
+      stream_len = (size_t)stream_len_int;
 
       cur_framesmpls += FRAMESAMPLES_10ms;
 
       /* read next bottleneck rate */
       if (f_bn != NULL) {
         if (fscanf(f_bn, "%d", &bottleneck) == EOF) {
           /* Set pointer to beginning of file */
           fseek(f_bn, 0L, SEEK_SET);
           fscanf(f_bn, "%d", &bottleneck);
         }
@@ skipping 48 matching lines @@
           errtype = WebRtcIsacfix_GetErrorCode(ISACFIX_main_inst);
           printf("\n\nError in decoder: %d.\n\n", errtype);
           // exit(EXIT_FAILURE);
         }
 
         declen = WebRtcIsac_Decode(ISAC_main_inst, streamdata, stream_len,
                                    decoded, speechType);
 
         /* iSAC decoding */
         if (plc && (framecnt + 1) % 10 == 0) {
-          if (nbTest != 2)
-            declen = WebRtcIsacfix_DecodePlc(ISACFIX_main_inst, decoded, 1);
-          else
-            declen = WebRtcIsacfix_DecodePlcNb(ISACFIX_main_inst, decoded, 1);
+          if (nbTest != 2) {
+            declen =
+                (int)WebRtcIsacfix_DecodePlc(ISACFIX_main_inst, decoded, 1);
+          } else {
+            declen =
+                (int)WebRtcIsacfix_DecodePlcNb(ISACFIX_main_inst, decoded, 1);
+          }
         } else {
           if (nbTest != 2)
             declen = WebRtcIsacfix_Decode(ISACFIX_main_inst, streamdata,
                                           stream_len, decoded, speechType);
           else
             declen = WebRtcIsacfix_DecodeNb(ISACFIX_main_inst, streamdata,
                                             stream_len, decoded, speechType);
         }
 
         if (declen <= 0) {
@@ skipping 33 matching lines @@
 
         if (err < 0) {
           /* exit if returned with error */
           errtype = WebRtcIsacfix_GetErrorCode(ISACFIX_main_inst);
           printf("\n\nError in decoder: %d.\n\n", errtype);
           // exit(EXIT_FAILURE);
         }
         /* iSAC decoding */
 
         if (plc && (framecnt + 1) % 10 == 0) {
-          if (nbTest != 2)
-            declen = WebRtcIsacfix_DecodePlc(ISACFIX_main_inst, decoded, 1);
-          else
-            declen = WebRtcIsacfix_DecodePlcNb(ISACFIX_main_inst, decoded, 1);
+          if (nbTest != 2) {
+            declen =
+                (int)WebRtcIsacfix_DecodePlc(ISACFIX_main_inst, decoded, 1);
+          } else {
+            declen =
+                (int)WebRtcIsacfix_DecodePlcNb(ISACFIX_main_inst, decoded, 1);
+          }
         } else {
           if (nbTest != 2) {
             declen = WebRtcIsacfix_Decode(ISACFIX_main_inst, streamdata,
                                           stream_len, decoded, speechType);
           } else {
             declen = WebRtcIsacfix_DecodeNb(ISACFIX_main_inst, streamdata,
                                             stream_len, decoded, speechType);
           }
         }
         if (declen <= 0) {
@@ skipping 17 matching lines @@
     totalbits += 8 * stream_len;
     kbps = (double)FS / (double)cur_framesmpls * 8.0 * stream_len / 1000.0;
     fy = fopen("bit_rate.dat", "a");
     fprintf(fy, "Frame %i = %0.14f\n", framecnt, kbps);
     fclose(fy);
 
 #endif /* _DEBUG */
   }
 
 #ifdef _DEBUG
-  printf("\n\ntotal bits               = %d bits", totalbits);
+  printf("\n\ntotal bits               = %" PRIuS " bits", totalbits);
   printf("\nmeasured average bitrate = %0.3f kbits/s",
          (double)totalbits * (FS / 1000) / totalsmpls);
   printf("\n");
 #endif /* _DEBUG */
 
   /* Runtime statistics */
   runtime = (double)(clock() / (double)CLOCKS_PER_SEC - starttime);
   length_file = ((double)framecnt * (double)declen / FS);
   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));
   printf("---------------------END----------------------\n");
 
   fclose(inp);
   fclose(outp);
 
   WebRtcIsac_Free(ISAC_main_inst);
   WebRtcIsacfix_Free(ISACFIX_main_inst);
 
   // fclose(histfile);
   // fclose(ratefile);
 
   return 0;
 }