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

Unified Diff: media/base/demuxer_stream.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 | « no previous file | media/base/filters.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/demuxer_stream.h
diff --git a/media/base/demuxer_stream.h b/media/base/demuxer_stream.h
index fb0739b4e2a8b8692b6629d7ed63bfb073adcb7d..d793d49f8867997dc762bf801adc7d25c703c31e 100644
--- a/media/base/demuxer_stream.h
+++ b/media/base/demuxer_stream.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -27,7 +27,9 @@ class MEDIA_EXPORT DemuxerStream
// Request a buffer to returned via the provided callback.
//
- // Buffers will be non-NULL yet may be end of stream buffers.
+ // Non-NULL buffer pointers will contain media data or signal the end of the
+ // stream. A NULL 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(const scoped_refptr<Buffer>&)> ReadCallback;
virtual void Read(const ReadCallback& read_callback) = 0;
« no previous file with comments | « no previous file | media/base/filters.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698