Switch to standard integer types in media/.

media/formats/webm/webm_tracks_parser.cc

 // Copyright 2014 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/formats/webm/webm_tracks_parser.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "media/base/timestamp_constants.h"
@@ skipping 12 matching lines @@
   if (codec_id == kWebMCodecDescriptions)
     return kTextDescriptions;
 
   if (codec_id == kWebMCodecMetadata)
     return kTextMetadata;
 
   return kTextNone;
 }
 
 static base::TimeDelta PrecisionCappedDefaultDuration(
-    const double timecode_scale_in_us, const int64 duration_in_ns) {
+    const double timecode_scale_in_us,
+    const int64_t duration_in_ns) {
   if (duration_in_ns <= 0)
     return kNoTimestamp();
 
-  int64 mult = duration_in_ns / 1000;
+  int64_t mult = duration_in_ns / 1000;
   mult /= timecode_scale_in_us;
   if (mult == 0)
     return kNoTimestamp();
 
   mult = static_cast<double>(mult) * timecode_scale_in_us;
   return base::TimeDelta::FromMicroseconds(mult);
 }
 
 WebMTracksParser::WebMTracksParser(const scoped_refptr<MediaLog>& media_log,
                                    bool ignore_text_tracks)
     : track_type_(-1),
       track_num_(-1),
       seek_preroll_(-1),
       codec_delay_(-1),
       default_duration_(-1),
       audio_track_num_(-1),
       audio_default_duration_(-1),
       video_track_num_(-1),
       video_default_duration_(-1),
       ignore_text_tracks_(ignore_text_tracks),
       media_log_(media_log),
       audio_client_(media_log),
       video_client_(media_log) {
 }
 
 WebMTracksParser::~WebMTracksParser() {}
 
-int WebMTracksParser::Parse(const uint8* buf, int size) {
+int WebMTracksParser::Parse(const uint8_t* buf, int size) {
   track_type_ =-1;
   track_num_ = -1;
   default_duration_ = -1;
   track_name_.clear();
   track_language_.clear();
   audio_track_num_ = -1;
   audio_default_duration_ = -1;
   audio_decoder_config_ = AudioDecoderConfig();
   video_track_num_ = -1;
   video_default_duration_ = -1;
@@ skipping 184 matching lines @@
     track_content_encodings_client_.reset();
 
     audio_client_.Reset();
     video_client_.Reset();
     return true;
   }
 
   return true;
 }
 
-bool WebMTracksParser::OnUInt(int id, int64 val) {
-  int64* dst = NULL;
+bool WebMTracksParser::OnUInt(int id, int64_t val) {
+  int64_t* dst = NULL;
 
   switch (id) {
     case kWebMIdTrackNumber:
       dst = &track_num_;
       break;
     case kWebMIdTrackType:
       dst = &track_type_;
       break;
     case kWebMIdSeekPreRoll:
       dst = &seek_preroll_;
@@ skipping 15 matching lines @@
   }
 
   *dst = val;
   return true;
 }
 
 bool WebMTracksParser::OnFloat(int id, double val) {
   return true;
 }
 
-bool WebMTracksParser::OnBinary(int id, const uint8* data, int size) {
+bool WebMTracksParser::OnBinary(int id, const uint8_t* data, int size) {
   if (id == kWebMIdCodecPrivate) {
     if (!codec_private_.empty()) {
       MEDIA_LOG(ERROR, media_log_)
           << "Multiple CodecPrivate fields in a track.";
       return false;
     }
     codec_private_.assign(data, data + size);
     return true;
   }
   return true;
@@ skipping 17 matching lines @@
 
   if (id == kWebMIdLanguage) {
     track_language_ = str;
     return true;
   }
 
   return true;
 }
 
 }  // namespace media