diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 04:48:33 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 04:48:33 +0000 |
| commit | b7f5fe96df69326e1d142daf179a34e820bfeafe (patch) | |
| tree | c9e3985c80a0140ce5109b4a65cc6d5c5428cd8f /media/base/demuxer_stream.h | |
| parent | 9d5e4555afb9a326696abad72ed64c15907b46a7 (diff) | |
| download | chromium_src-b7f5fe96df69326e1d142daf179a34e820bfeafe.zip chromium_src-b7f5fe96df69326e1d142daf179a34e820bfeafe.tar.gz chromium_src-b7f5fe96df69326e1d142daf179a34e820bfeafe.tar.bz2 | |
Fix ChunkDemuxer seek deadlock
BUG=109879
TEST=PipelineIntegrationTest.ChunkDemuxerAbortRead_*,FFmpegAudioDecoderTest.AbortRead, AudioRendererBaseTest.AbortPendingRead_*
Review URL: https://chromiumcodereview.appspot.com/9295020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/demuxer_stream.h')
| -rw-r--r-- | media/base/demuxer_stream.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/base/demuxer_stream.h b/media/base/demuxer_stream.h index fb0739b..d793d49 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; |