Switch to standard integer types in media/, take 2.

media/capture/webm_muxer.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/capture/webm_muxer.h"
 
 #include "base/bind.h"
 #include "media/audio/audio_parameters.h"
 #include "media/base/limits.h"
 #include "media/base/video_frame.h"
 #include "media/filters/opus_constants.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace media {
 
 namespace {
 
-void WriteOpusHeader(const media::AudioParameters& params, uint8* header) {
+void WriteOpusHeader(const media::AudioParameters& params, uint8_t* header) {
   // See https://wiki.xiph.org/OggOpus#ID_Header.
   // Set magic signature.
   std::string label = "OpusHead";
   memcpy(header + OPUS_EXTRADATA_LABEL_OFFSET, label.c_str(), label.size());
   // Set Opus version.
   header[OPUS_EXTRADATA_VERSION_OFFSET] = 1;
   // Set channel count.
   header[OPUS_EXTRADATA_CHANNELS_OFFSET] = params.channels();
   // Set pre-skip
-  uint16 skip = 0;
-  memcpy(header + OPUS_EXTRADATA_SKIP_SAMPLES_OFFSET, &skip, sizeof(uint16));
+  uint16_t skip = 0;
+  memcpy(header + OPUS_EXTRADATA_SKIP_SAMPLES_OFFSET, &skip, sizeof(uint16_t));
   // Set original input sample rate in Hz.
-  uint32 sample_rate = params.sample_rate();
+  uint32_t sample_rate = params.sample_rate();
   memcpy(header + OPUS_EXTRADATA_SAMPLE_RATE_OFFSET, &sample_rate,
-         sizeof(uint32));
+         sizeof(uint32_t));
   // Set output gain in dB.
-  uint16 gain = 0;
+  uint16_t gain = 0;
   memcpy(header + OPUS_EXTRADATA_GAIN_OFFSET, &gain, 2);
 
   // Set channel mapping.
   if (params.channels() > 2) {
     // Also possible to have a multistream, not supported for now.
     DCHECK_LE(params.channels(), OPUS_MAX_VORBIS_CHANNELS);
     header[OPUS_EXTRADATA_CHANNEL_MAPPING_OFFSET] = 1;
     // Assuming no coupled streams. This should actually be
     // channels() - |coupled_streams|.
     header[OPUS_EXTRADATA_NUM_STREAMS_OFFSET] = params.channels();
@@ skipping 164 matching lines @@
 
   mkvmuxer::AudioTrack* const audio_track =
       reinterpret_cast<mkvmuxer::AudioTrack*>(
           segment_.GetTrackByNumber(audio_track_index_));
   DCHECK(audio_track);
   audio_track->set_codec_id(mkvmuxer::Tracks::kOpusCodecId);
 
   DCHECK_EQ(params.sample_rate(), audio_track->sample_rate());
   DCHECK_EQ(params.channels(), static_cast<int>(audio_track->channels()));
 
-  uint8 opus_header[OPUS_EXTRADATA_SIZE];
+  uint8_t opus_header[OPUS_EXTRADATA_SIZE];
   WriteOpusHeader(params, opus_header);
 
   if (!audio_track->SetCodecPrivate(opus_header, OPUS_EXTRADATA_SIZE))
     LOG(ERROR) << __FUNCTION__ << ": failed to set opus header.";
 
   // Segment's timestamps should be in milliseconds, DCHECK it. See
   // http://www.webmproject.org/docs/container/#muxer-guidelines
   DCHECK_EQ(1000000ull, segment_.GetSegmentInfo()->timecode_scale());
 }
 
@@ skipping 38 matching lines @@
       std::max(most_recent_timestamp_, timestamp - first_frame_timestamp_);
 
   segment_.AddFrame(reinterpret_cast<const uint8_t*>(encoded_data->data()),
                     encoded_data->size(), track_index,
                     most_recent_timestamp_.InMicroseconds() *
                         base::Time::kNanosecondsPerMicrosecond,
                     is_key_frame);
 }
 
 }  // namespace media