Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(543)

Unified Diff: media/filters/ffmpeg_glue.cc

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/filters/ffmpeg_glue.cc
diff --git a/media/filters/ffmpeg_glue.cc b/media/filters/ffmpeg_glue.cc
index bfeced058e7ee16c6182beb5090b7285c76432b7..d3819d2a89f421bb90aa47d2400714f37ccaab7a 100644
--- a/media/filters/ffmpeg_glue.cc
+++ b/media/filters/ffmpeg_glue.cc
@@ -27,9 +27,9 @@ static int AVIOReadOperation(void* opaque, uint8_t* buf, int buf_size) {
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))
@@ -37,7 +37,7 @@ static int64 AVIOSeekOperation(void* opaque, int64 offset, int whence) {
break;
case SEEK_CUR:
- int64 pos;
+ int64_t pos;
if (!protocol->GetPosition(&pos))
break;
if (protocol->SetPosition(pos + offset))
@@ -45,7 +45,7 @@ static int64 AVIOSeekOperation(void* opaque, int64 offset, int whence) {
break;
case SEEK_END:
- int64 size;
+ int64_t size;
if (!protocol->GetSize(&size))
break;
if (protocol->SetPosition(size + offset))
@@ -161,9 +161,9 @@ bool FFmpegGlue::OpenContext() {
// 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());

Powered by Google App Engine
This is Rietveld 408576698