Misc. small cleanups

webrtc/modules/media_file/media_file_utility.h

 /*
  *  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 158 matching lines @@
 
     // Return the number of ms that have been played so far.
     uint32_t PlayoutPositionMs();
 
     // Update codecInst according to the current audio codec being used for
     // reading or writing.
     int32_t codec_info(CodecInst& codecInst);
 
 private:
     // Biggest WAV frame supported is 10 ms at 48kHz of 2 channel, 16 bit audio.
-    enum{WAV_MAX_BUFFER_SIZE = 480*2*2};
+    static const size_t WAV_MAX_BUFFER_SIZE = 480 * 2 * 2;
 
 
     int32_t InitWavCodec(uint32_t samplesPerSec,
                          uint32_t channels,
                          uint32_t bitsPerSample,
                          uint32_t formatTag);
 
     // Parse the WAV header in stream.
     int32_t ReadWavHeader(InStream& stream);
 
     // Update the WAV header. freqInHz, bytesPerSample, channels, format,
     // lengthInBytes specify characterists of the audio data.
     // freqInHz is the sampling frequency. bytesPerSample is the sample size in
     // bytes. channels is the number of channels, e.g. 1 is mono and 2 is
     // stereo. format is the encode format (e.g. PCMU, PCMA, PCM etc).
     // lengthInBytes is the number of bytes the audio samples are using up.
     int32_t WriteWavHeader(OutStream& stream,
-                           const uint32_t freqInHz,
-                           const uint32_t bytesPerSample,
-                           const uint32_t channels,
-                           const uint32_t format,
-                           const uint32_t lengthInBytes);
+                           uint32_t freqInHz,
+                           size_t bytesPerSample,
+                           uint32_t channels,
+                           uint32_t format,
+                           size_t lengthInBytes);
 
     // Put dataLengthInBytes of audio data from stream into the audioBuffer.
     // The return value is the number of bytes written to audioBuffer.
     int32_t ReadWavData(InStream& stream, uint8_t* audioBuffer,
-                        const uint32_t dataLengthInBytes);
+                        size_t dataLengthInBytes);
 
     // Update the current audio codec being used for reading or writing
     // according to codecInst.
     int32_t set_codec_info(const CodecInst& codecInst);
 
     struct WAVE_FMTINFO_header
     {
         int16_t formatTag;
         int16_t nChannels;
         int32_t nSamplesPerSec;
@@ skipping 30 matching lines @@
         kCodecG726_32,
         kCodecG726_24,
         kCodecG726_16,
         kCodecSpeex8Khz,
         kCodecSpeex16Khz
     };
 
     // TODO (hellner): why store multiple formats. Just store either codec_info_
     //                 or _wavFormatObj and supply conversion functions.
     WAVE_FMTINFO_header _wavFormatObj;
-    int32_t _dataSize;      // Chunk size if reading a WAV file
+    size_t _dataSize;      // Chunk size if reading a WAV file
     // Number of bytes to read. I.e. frame size in bytes. May be multiple
     // chunks if reading WAV.
-    int32_t _readSizeBytes;
+    size_t _readSizeBytes;
 
     int32_t _id;
 
     uint32_t _stopPointInMs;
     uint32_t _startPointInMs;
     uint32_t _playoutPositionMs;
     size_t _bytesWritten;
 
     CodecInst codec_info_;
     MediaFileUtility_CodecType _codecId;
 
     // The amount of bytes, on average, used for one audio sample.
-    int32_t  _bytesPerSample;
-    int32_t  _readPos;
+    size_t _bytesPerSample;
+    size_t _readPos;
 
     // Only reading or writing can be enabled, not both.
     bool _reading;
     bool _writing;
 
     // Scratch buffer used for turning stereo audio to mono.
     uint8_t _tempData[WAV_MAX_BUFFER_SIZE];
 };
 }  // namespace webrtc
 #endif // WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_UTILITY_H_