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

Unified Diff: media/base/filters.h

Issue 9295020: Fix ChunkDemuxer seek deadlock (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix copyright year. Created 8 years, 11 months 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
« no previous file with comments | « media/base/demuxer_stream.h ('k') | media/filters/audio_renderer_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/filters.h
diff --git a/media/base/filters.h b/media/base/filters.h
index 8f186d676ad8608e1cc66f4f5029c469c5e0bd5e..cf8bcea82ca1eed17ccfe470ab357756856c5659 100644
--- a/media/base/filters.h
+++ b/media/base/filters.h
@@ -135,7 +135,9 @@ class MEDIA_EXPORT VideoDecoder : public Filter {
// Implementations guarantee that the callback will not be called from within
// this method.
//
- // Frames will be non-NULL yet may be end of stream frames.
+ // Non-NULL frames contain decoded video data or may indicate the end of
+ // the stream. NULL video frames indicate an aborted read. This can happen if
+ // the DemuxerStream gets flushed and doesn't have any more data to return.
typedef base::Callback<void(scoped_refptr<VideoFrame>)> ReadCB;
virtual void Read(const ReadCB& callback) = 0;
@@ -183,7 +185,10 @@ class MEDIA_EXPORT AudioDecoder : public Filter {
// Implementations guarantee that the callback will not be called from within
// this method.
//
- // Sample buffers will be non-NULL yet may be end of stream buffers.
+ // Non-NULL sample buffer pointers will contain decoded audio data or may
+ // indicate the end of the stream. A NULL buffer pointer indicates an aborted
+ // Read(). This can happen if the DemuxerStream gets flushed and doesn't have
+ // any more data to return.
typedef base::Callback<void(scoped_refptr<Buffer>)> ReadCB;
virtual void Read(const ReadCB& callback) = 0;
« no previous file with comments | « media/base/demuxer_stream.h ('k') | media/filters/audio_renderer_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698