Index: content/common/gpu/media/android_video_encode_accelerator.cc |
diff --git a/content/common/gpu/media/android_video_encode_accelerator.cc b/content/common/gpu/media/android_video_encode_accelerator.cc |
index 33a73e05a1f54d3df2c71b8424c3da95855933b7..bdc4ffbe77d6a7c135206e28fb7af8123202ee79 100644 |
--- a/content/common/gpu/media/android_video_encode_accelerator.cc |
+++ b/content/common/gpu/media/android_video_encode_accelerator.cc |
@@ -253,7 +253,8 @@ void AndroidVideoEncodeAccelerator::Encode( |
"Non-packed frame, or visible_rect != coded_size", |
kInvalidArgumentError); |
- pending_frames_.push(MakeTuple(frame, force_keyframe, base::Time::Now())); |
+ pending_frames_.push( |
+ base::MakeTuple(frame, force_keyframe, base::Time::Now())); |
DoIOTask(); |
} |
@@ -320,7 +321,7 @@ void AndroidVideoEncodeAccelerator::QueueInput() { |
} |
const PendingFrames::value_type& input = pending_frames_.front(); |
- bool is_key_frame = get<1>(input); |
+ bool is_key_frame = base::get<1>(input); |
if (is_key_frame) { |
// Ideally MediaCodec would honor BUFFER_FLAG_SYNC_FRAME so we could |
// indicate this in the QueueInputBuffer() call below and guarantee _this_ |
@@ -328,7 +329,7 @@ void AndroidVideoEncodeAccelerator::QueueInput() { |
// Instead, we request a key frame "soon". |
media_codec_->RequestKeyFrameSoon(); |
} |
- scoped_refptr<VideoFrame> frame = get<0>(input); |
+ scoped_refptr<VideoFrame> frame = base::get<0>(input); |
uint8* buffer = NULL; |
size_t capacity = 0; |
@@ -365,7 +366,7 @@ void AndroidVideoEncodeAccelerator::QueueInput() { |
status = media_codec_->QueueInputBuffer( |
input_buf_index, NULL, queued_size, fake_input_timestamp_); |
UMA_HISTOGRAM_TIMES("Media.AVEA.InputQueueTime", |
- base::Time::Now() - get<2>(input)); |
+ base::Time::Now() - base::get<2>(input)); |
RETURN_ON_FAILURE(status == media::MEDIA_CODEC_OK, |
"Failed to QueueInputBuffer: " << status, |
kPlatformFailureError); |