Misc. small cleanups

webrtc/modules/audio_processing/test/unpack.cc

 /*
  *  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.
  */
 
@@ skipping 58 matching lines @@
 
   if (argc < 2) {
     printf("%s", google::ProgramUsage());
     return 1;
   }
 
   FILE* debug_file = OpenFile(argv[1], "rb");
 
   Event event_msg;
   int frame_count = 0;
-  int reverse_samples_per_channel = 0;
-  int input_samples_per_channel = 0;
-  int output_samples_per_channel = 0;
+  size_t reverse_samples_per_channel = 0;
+  size_t input_samples_per_channel = 0;
+  size_t output_samples_per_channel = 0;
   int num_reverse_channels = 0;
   int num_input_channels = 0;
   int num_output_channels = 0;
   rtc::scoped_ptr<WavWriter> reverse_wav_file;
   rtc::scoped_ptr<WavWriter> input_wav_file;
   rtc::scoped_ptr<WavWriter> output_wav_file;
   rtc::scoped_ptr<RawFile> reverse_raw_file;
   rtc::scoped_ptr<RawFile> input_raw_file;
   rtc::scoped_ptr<RawFile> output_raw_file;
 
@@ skipping 184 matching lines @@
 
       fprintf(settings_file, "\n");
 
       if (reverse_sample_rate == 0) {
         reverse_sample_rate = input_sample_rate;
       }
       if (output_sample_rate == 0) {
         output_sample_rate = input_sample_rate;
       }
 
-      reverse_samples_per_channel = reverse_sample_rate / 100;
-      input_samples_per_channel = input_sample_rate / 100;
-      output_samples_per_channel = output_sample_rate / 100;
+      reverse_samples_per_channel =
+          static_cast<size_t>(reverse_sample_rate / 100);
+      input_samples_per_channel =
+          static_cast<size_t>(input_sample_rate / 100);
+      output_samples_per_channel =
+          static_cast<size_t>(output_sample_rate / 100);
 
       if (!FLAGS_raw) {
         // The WAV files need to be reset every time, because they cant change
         // their sample rate or number of channels.
         reverse_wav_file.reset(new WavWriter(FLAGS_reverse_file + ".wav",
                                              reverse_sample_rate,
                                              num_reverse_channels));
         input_wav_file.reset(new WavWriter(FLAGS_input_file + ".wav",
                                            input_sample_rate,
                                            num_input_channels));
         output_wav_file.reset(new WavWriter(FLAGS_output_file + ".wav",
                                             output_sample_rate,
                                             num_output_channels));
       }
     }
   }
 
   return 0;
 }
 
 }  // namespace webrtc
 
 int main(int argc, char* argv[]) {
   return webrtc::do_main(argc, argv);
 }