diff options
| author | annacc@chromium.org <annacc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-29 22:49:31 +0000 |
|---|---|---|
| committer | annacc@chromium.org <annacc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-29 22:49:31 +0000 |
| commit | a4dcf06e3e0d6fd5be7376d191e6a5291fe4a416 (patch) | |
| tree | abe2ef62e756a4065c57d8f90111a71f25cf94c2 /webkit | |
| parent | 7c5b9b43fac48a72a8481658a3adbcbd1d2b87f6 (diff) | |
| download | chromium_src-a4dcf06e3e0d6fd5be7376d191e6a5291fe4a416.zip chromium_src-a4dcf06e3e0d6fd5be7376d191e6a5291fe4a416.tar.gz chromium_src-a4dcf06e3e0d6fd5be7376d191e6a5291fe4a416.tar.bz2 | |
This patch integrates SourceBufferStreams into SourceBuffer, removes all buffering functionality from ChunkDemuxerStream so that it now refers to SourceBufferStream (through ChunkDemuxer/SourceBuffer) for buffer data.
A few notes about this patch:
* We are still assuming only 1 source ID (and 1 SourceBuffer)
* SourceBuffer still has only 1 audio and 1 video streams
* ChunkDemuxerStream now has a handle to its ChunkDemuxer so that it can ask for data from ChunkDemuxer's SourceBuffer.
BUG=125208
TEST=source_buffer_unittest.cc (coming soon)
Review URL: https://chromiumcodereview.appspot.com/10388099
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/media/webmediaplayer_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/media/webmediaplayer_proxy.cc | 4 | ||||
| -rw-r--r-- | webkit/media/webmediaplayer_proxy.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc index 657d9ff..26245a9 100644 --- a/webkit/media/webmediaplayer_impl.cc +++ b/webkit/media/webmediaplayer_impl.cc @@ -303,7 +303,7 @@ void WebMediaPlayerImpl::seek(float seconds) { seeking_ = true; - proxy_->DemuxerFlush(); + proxy_->DemuxerStartWaitingForSeek(); // Kick off the asynchronous seek! pipeline_->Seek( diff --git a/webkit/media/webmediaplayer_proxy.cc b/webkit/media/webmediaplayer_proxy.cc index 4078192..84d064b 100644 --- a/webkit/media/webmediaplayer_proxy.cc +++ b/webkit/media/webmediaplayer_proxy.cc @@ -189,9 +189,9 @@ void WebMediaPlayerProxy::KeyNeeded(scoped_array<uint8> init_data, base::Passed(&init_data), init_data_size)); } -void WebMediaPlayerProxy::DemuxerFlush() { +void WebMediaPlayerProxy::DemuxerStartWaitingForSeek() { if (chunk_demuxer_.get()) - chunk_demuxer_->FlushData(); + chunk_demuxer_->StartWaitingForSeek(); } media::ChunkDemuxer::Status WebMediaPlayerProxy::DemuxerAddId( diff --git a/webkit/media/webmediaplayer_proxy.h b/webkit/media/webmediaplayer_proxy.h index 8bc7215..12554f2 100644 --- a/webkit/media/webmediaplayer_proxy.h +++ b/webkit/media/webmediaplayer_proxy.h @@ -92,7 +92,7 @@ class WebMediaPlayerProxy int init_data_size) OVERRIDE; // Methods for Demuxer communication. - void DemuxerFlush(); + void DemuxerStartWaitingForSeek(); media::ChunkDemuxer::Status DemuxerAddId(const std::string& id, const std::string& type, std::vector<std::string>& codecs); |