diff options
| author | annacc@chromium.org <annacc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-12 22:50:17 +0000 |
|---|---|---|
| committer | annacc@chromium.org <annacc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-12 22:50:17 +0000 |
| commit | 00737f8f5c56fc51352f4aabb89292c7e30637dd (patch) | |
| tree | ed8d0de613e94225a2540674ddfbacb4a601af2c | |
| parent | 9b7315d1102e0492ae4cb5aa6d2bc657728bcc60 (diff) | |
| download | chromium_src-00737f8f5c56fc51352f4aabb89292c7e30637dd.zip chromium_src-00737f8f5c56fc51352f4aabb89292c7e30637dd.tar.gz chromium_src-00737f8f5c56fc51352f4aabb89292c7e30637dd.tar.bz2 | |
Return the results of Append in ChunkDemuxer::On{Audio,Video}Buffers()
We weren't able to successfully return results until overlaps etc. were properly computed in SourceBufferStream::Append(). That's fixed now (http://crbug.com/125072), so let's start returning!
BUG=132314
TEST=media_unittests
Review URL: https://chromiumcodereview.appspot.com/10542128
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141767 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | media/filters/chunk_demuxer.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc index 1e16154..a47d6e23 100644 --- a/media/filters/chunk_demuxer.cc +++ b/media/filters/chunk_demuxer.cc @@ -867,10 +867,7 @@ bool ChunkDemuxer::OnAudioBuffers(const StreamParser::BufferQueue& buffers) { if (!audio_) return false; - // TODO(annacc): return Append's result after http://crbug.com/125072 is fixed - audio_->Append(buffers); - - return true; + return audio_->Append(buffers); } bool ChunkDemuxer::OnVideoBuffers(const StreamParser::BufferQueue& buffers) { @@ -879,10 +876,7 @@ bool ChunkDemuxer::OnVideoBuffers(const StreamParser::BufferQueue& buffers) { if (!video_) return false; - // TODO(annacc): return Append's result after http://crbug.com/125072 is fixed - video_->Append(buffers); - - return true; + return video_->Append(buffers); } bool ChunkDemuxer::OnKeyNeeded(scoped_array<uint8> init_data, |