Switch to standard integer types in media/.

media/filters/ffmpeg_glue.cc

 // Copyright (c) 2012 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/filters/ffmpeg_glue.h"
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/synchronization/lock.h"
 #include "media/base/container_names.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 
 namespace media {
 
 // Internal buffer size used by AVIO for reading.
 // TODO(dalecurtis): Experiment with this buffer size and measure impact on
 // performance.  Currently we want to use 32kb to preserve existing behavior
 // with the previous URLProtocol based approach.
 enum { kBufferSize = 32 * 1024 };
 
 static int AVIOReadOperation(void* opaque, uint8_t* buf, int buf_size) {
   FFmpegURLProtocol* protocol = reinterpret_cast<FFmpegURLProtocol*>(opaque);
   int result = protocol->Read(buf_size, buf);
   if (result < 0)
     result = AVERROR(EIO);
   return result;
 }
 
-static int64 AVIOSeekOperation(void* opaque, int64 offset, int whence) {
+static int64_t AVIOSeekOperation(void* opaque, int64_t offset, int whence) {
   FFmpegURLProtocol* protocol = reinterpret_cast<FFmpegURLProtocol*>(opaque);
-  int64 new_offset = AVERROR(EIO);
+  int64_t new_offset = AVERROR(EIO);
   switch (whence) {
     case SEEK_SET:
       if (protocol->SetPosition(offset))
         protocol->GetPosition(&new_offset);
       break;
 
     case SEEK_CUR:
-      int64 pos;
+      int64_t pos;
       if (!protocol->GetPosition(&pos))
         break;
       if (protocol->SetPosition(pos + offset))
         protocol->GetPosition(&new_offset);
       break;
 
     case SEEK_END:
-      int64 size;
+      int64_t size;
       if (!protocol->GetSize(&size))
         break;
       if (protocol->SetPosition(size + offset))
         protocol->GetPosition(&new_offset);
       break;
 
     case AVSEEK_SIZE:
       protocol->GetSize(&new_offset);
       break;
 
@@ skipping 95 matching lines @@
 
 bool FFmpegGlue::OpenContext() {
   DCHECK(!open_called_) << "OpenContext() shouldn't be called twice.";
 
   // If avformat_open_input() is called we have to take a slightly different
   // destruction path to avoid double frees.
   open_called_ = true;
 
   // Attempt to recognize the container by looking at the first few bytes of the
   // stream. The stream position is left unchanged.
-  scoped_ptr<std::vector<uint8> > buffer(new std::vector<uint8>(8192));
+  scoped_ptr<std::vector<uint8_t>> buffer(new std::vector<uint8_t>(8192));
 
-  int64 pos = AVIOSeekOperation(avio_context_.get()->opaque, 0, SEEK_CUR);
+  int64_t pos = AVIOSeekOperation(avio_context_.get()->opaque, 0, SEEK_CUR);
   AVIOSeekOperation(avio_context_.get()->opaque, 0, SEEK_SET);
   int numRead = AVIOReadOperation(
       avio_context_.get()->opaque, buffer.get()->data(), buffer.get()->size());
   AVIOSeekOperation(avio_context_.get()->opaque, pos, SEEK_SET);
   if (numRead > 0) {
     // < 0 means Read failed
     container_names::MediaContainerName container =
         container_names::DetermineContainer(buffer.get()->data(), numRead);
     UMA_HISTOGRAM_SPARSE_SLOWLY("Media.DetectedContainer", container);
   }
@@ skipping 38 matching lines @@
         avcodec_close(stream->codec);
       }
     }
   }
 
   avformat_close_input(&format_context_);
   av_free(avio_context_->buffer);
 }
 
 }  // namespace media