Index: media/filters/ffmpeg_demuxer.cc |
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc |
index 00de84134f47c6e2b22b940d7dc55148b99b1fc0..63fd194e6d8379d5b823a5c94a864e33f47ee4c8 100644 |
--- a/media/filters/ffmpeg_demuxer.cc |
+++ b/media/filters/ffmpeg_demuxer.cc |
@@ -125,7 +125,8 @@ void FFmpegDemuxerStream::Stop() { |
buffer_queue_.clear(); |
for (ReadQueue::iterator it = read_queue_.begin(); |
it != read_queue_.end(); ++it) { |
- it->Run(scoped_refptr<DecoderBuffer>(DecoderBuffer::CreateEOSBuffer())); |
+ it->Run(DemuxerStream::kOk, |
Ami GONE FROM CHROMIUM
2012/06/26 00:33:21
I'm surprised that nothing in this file Run()'s a
acolwell GONE FROM CHROMIUM
2012/07/12 01:19:38
FFmpeg can always return a buffer or end of stream
|
+ scoped_refptr<DecoderBuffer>(DecoderBuffer::CreateEOSBuffer())); |
} |
read_queue_.clear(); |
stopped_ = true; |
@@ -148,7 +149,8 @@ void FFmpegDemuxerStream::Read(const ReadCB& read_cb) { |
// |
// TODO(scherkus): it would be cleaner if we replied with an error message. |
if (stopped_) { |
- read_cb.Run(scoped_refptr<DecoderBuffer>(DecoderBuffer::CreateEOSBuffer())); |
+ read_cb.Run(DemuxerStream::kOk, |
+ scoped_refptr<DecoderBuffer>(DecoderBuffer::CreateEOSBuffer())); |
return; |
} |
@@ -164,7 +166,7 @@ void FFmpegDemuxerStream::Read(const ReadCB& read_cb) { |
// Send the oldest buffer back. |
scoped_refptr<DecoderBuffer> buffer = buffer_queue_.front(); |
buffer_queue_.pop_front(); |
- read_cb.Run(buffer); |
+ read_cb.Run(DemuxerStream::kOk, buffer); |
} |
void FFmpegDemuxerStream::ReadTask(const ReadCB& read_cb) { |
@@ -175,7 +177,8 @@ void FFmpegDemuxerStream::ReadTask(const ReadCB& read_cb) { |
// |
// TODO(scherkus): it would be cleaner if we replied with an error message. |
if (stopped_) { |
- read_cb.Run(scoped_refptr<DecoderBuffer>(DecoderBuffer::CreateEOSBuffer())); |
+ read_cb.Run(DemuxerStream::kOk, |
+ scoped_refptr<DecoderBuffer>(DecoderBuffer::CreateEOSBuffer())); |
return; |
} |
@@ -203,7 +206,7 @@ void FFmpegDemuxerStream::FulfillPendingRead() { |
read_queue_.pop_front(); |
// Execute the callback. |
- read_cb.Run(buffer); |
+ read_cb.Run(DemuxerStream::kOk, buffer); |
} |
void FFmpegDemuxerStream::EnableBitstreamConverter() { |