Switch to standard integer types in media/.

media/formats/webm/webm_stream_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_stream_parser.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
@@ skipping 49 matching lines @@
 
   byte_queue_.Reset();
   if (cluster_parser_)
     cluster_parser_->Reset();
   if (state_ == kParsingClusters) {
     ChangeState(kParsingHeaders);
     end_of_segment_cb_.Run();
   }
 }
 
-bool WebMStreamParser::Parse(const uint8* buf, int size) {
+bool WebMStreamParser::Parse(const uint8_t* buf, int size) {
   DCHECK_NE(state_, kWaitingForInit);
 
   if (state_ == kError)
     return false;
 
   byte_queue_.Push(buf, size);
 
   int result = 0;
   int bytes_parsed = 0;
-  const uint8* cur = NULL;
+  const uint8_t* cur = NULL;
   int cur_size = 0;
 
   byte_queue_.Peek(&cur, &cur_size);
   while (cur_size > 0) {
     State oldState = state_;
     switch (state_) {
       case kParsingHeaders:
         result = ParseInfoAndTracks(cur, cur_size);
         break;
 
@@ skipping 22 matching lines @@
 
   byte_queue_.Pop(bytes_parsed);
   return true;
 }
 
 void WebMStreamParser::ChangeState(State new_state) {
   DVLOG(1) << "ChangeState() : " << state_ << " -> " << new_state;
   state_ = new_state;
 }
 
-int WebMStreamParser::ParseInfoAndTracks(const uint8* data, int size) {
+int WebMStreamParser::ParseInfoAndTracks(const uint8_t* data, int size) {
   DVLOG(2) << "ParseInfoAndTracks()";
   DCHECK(data);
   DCHECK_GT(size, 0);
 
-  const uint8* cur = data;
+  const uint8_t* cur = data;
   int cur_size = size;
   int bytes_parsed = 0;
 
   int id;
-  int64 element_size;
+  int64_t element_size;
   int result = WebMParseElementHeader(cur, cur_size, &id, &element_size);
 
   if (result <= 0)
     return result;
 
   switch (id) {
     case kWebMIdEBMLHeader:
     case kWebMIdSeekHead:
     case kWebMIdVoid:
     case kWebMIdCRC32:
@@ skipping 50 matching lines @@
 
   if (result <= 0)
     return result;
 
   bytes_parsed += result;
 
   double timecode_scale_in_us = info_parser.timecode_scale() / 1000.0;
   InitParameters params(kInfiniteDuration());
 
   if (info_parser.duration() > 0) {
-    int64 duration_in_us = info_parser.duration() * timecode_scale_in_us;
+    int64_t duration_in_us = info_parser.duration() * timecode_scale_in_us;
     params.duration = base::TimeDelta::FromMicroseconds(duration_in_us);
   }
 
   params.timeline_offset = info_parser.date_utc();
 
   if (unknown_segment_size_ && (info_parser.duration() <= 0) &&
       !info_parser.date_utc().is_null()) {
     params.liveness = DemuxerStream::LIVENESS_LIVE;
   } else if (info_parser.duration() >= 0) {
     params.liveness = DemuxerStream::LIVENESS_RECORDED;
@@ skipping 25 matching lines @@
       tracks_parser.audio_encryption_key_id(),
       tracks_parser.video_encryption_key_id(), audio_config.codec(),
       media_log_));
 
   if (!init_cb_.is_null())
     base::ResetAndReturn(&init_cb_).Run(params);
 
   return bytes_parsed;
 }
 
-int WebMStreamParser::ParseCluster(const uint8* data, int size) {
+int WebMStreamParser::ParseCluster(const uint8_t* data, int size) {
   if (!cluster_parser_)
     return -1;
 
   int bytes_parsed = cluster_parser_->Parse(data, size);
   if (bytes_parsed < 0)
     return bytes_parsed;
 
   const BufferQueue& audio_buffers = cluster_parser_->GetAudioBuffers();
   const BufferQueue& video_buffers = cluster_parser_->GetVideoBuffers();
   const TextBufferQueueMap& text_map = cluster_parser_->GetTextBuffers();
 
   bool cluster_ended = cluster_parser_->cluster_ended();
 
   if ((!audio_buffers.empty() || !video_buffers.empty() ||
        !text_map.empty()) &&
       !new_buffers_cb_.Run(audio_buffers, video_buffers, text_map)) {
     return -1;
   }
 
   if (cluster_ended) {
     ChangeState(kParsingHeaders);
     end_of_segment_cb_.Run();
   }
 
   return bytes_parsed;
 }
 
 void WebMStreamParser::OnEncryptedMediaInitData(const std::string& key_id) {
-  std::vector<uint8> key_id_vector(key_id.begin(), key_id.end());
+  std::vector<uint8_t> key_id_vector(key_id.begin(), key_id.end());
   encrypted_media_init_data_cb_.Run(EmeInitDataType::WEBM, key_id_vector);
 }
 
 }  // namespace media