Index: media/filters/ffmpeg_video_decoder.cc |
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc |
index f85b6cbc0b966597681a428a05cd4fecbb333519..bdd4c135d55921ac4e91dab5e72afe19a055398a 100644 |
--- a/media/filters/ffmpeg_video_decoder.cc |
+++ b/media/filters/ffmpeg_video_decoder.cc |
@@ -208,14 +208,16 @@ void FFmpegVideoDecoder::ReadFromDemuxerStream() { |
demuxer_stream_->Read(base::Bind(&FFmpegVideoDecoder::DecodeBuffer, this)); |
} |
-void FFmpegVideoDecoder::DecodeBuffer(const scoped_refptr<Buffer>& buffer) { |
+void FFmpegVideoDecoder::DecodeBuffer( |
+ const scoped_refptr<DecoderBuffer>& buffer) { |
// TODO(scherkus): fix FFmpegDemuxerStream::Read() to not execute our read |
// callback on the same execution stack so we can get rid of forced task post. |
message_loop_->PostTask(FROM_HERE, base::Bind( |
&FFmpegVideoDecoder::DoDecodeBuffer, this, buffer)); |
} |
-void FFmpegVideoDecoder::DoDecodeBuffer(const scoped_refptr<Buffer>& buffer) { |
+void FFmpegVideoDecoder::DoDecodeBuffer( |
+ const scoped_refptr<DecoderBuffer>& buffer) { |
DCHECK_EQ(MessageLoop::current(), message_loop_); |
DCHECK_NE(state_, kUninitialized); |
DCHECK_NE(state_, kDecodeFinished); |
@@ -262,7 +264,7 @@ void FFmpegVideoDecoder::DoDecodeBuffer(const scoped_refptr<Buffer>& buffer) { |
state_ = kFlushCodec; |
} |
- scoped_refptr<Buffer> unencrypted_buffer = buffer; |
+ scoped_refptr<DecoderBuffer> unencrypted_buffer = buffer; |
if (buffer->GetDecryptConfig() && buffer->GetDataSize()) { |
unencrypted_buffer = decryptor_.Decrypt(buffer); |
if (!unencrypted_buffer || !unencrypted_buffer->GetDataSize()) { |
@@ -303,7 +305,7 @@ void FFmpegVideoDecoder::DoDecodeBuffer(const scoped_refptr<Buffer>& buffer) { |
} |
bool FFmpegVideoDecoder::Decode( |
- const scoped_refptr<Buffer>& buffer, |
+ const scoped_refptr<DecoderBuffer>& buffer, |
scoped_refptr<VideoFrame>* video_frame) { |
DCHECK(video_frame); |