summaryrefslogtreecommitdiffstats
path: root/webkit/media
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-18 09:30:32 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-18 09:30:32 +0000
commitd399866c2fe77410afed5be486f2b72581823bed (patch)
treeb7da4bc8b767ed87053ce974642598db1d1a6b4a /webkit/media
parent12bb3e11aac582a23034e3538a689e9a3a28da86 (diff)
downloadchromium_src-d399866c2fe77410afed5be486f2b72581823bed.zip
chromium_src-d399866c2fe77410afed5be486f2b72581823bed.tar.gz
chromium_src-d399866c2fe77410afed5be486f2b72581823bed.tar.bz2
Fold media::PipelineImpl into media::Pipeline as there is only one implementation of the interface.
Three years ago I thought that having a separate interface would be A Good Thing. Needless to say there has never been a case where having an interface defintion of Pipeline came in handy as all clients create and access PipelineImpl objects directly. Review URL: http://codereview.chromium.org/9243025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
-rw-r--r--webkit/media/webmediaplayer_impl.cc4
-rw-r--r--webkit/media/webmediaplayer_impl.h8
-rw-r--r--webkit/media/webmediaplayer_proxy.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index aa41171..706ab8f 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -16,7 +16,7 @@
#include "media/base/limits.h"
#include "media/base/media_log.h"
#include "media/base/media_switches.h"
-#include "media/base/pipeline_impl.h"
+#include "media/base/pipeline.h"
#include "media/base/video_frame.h"
#include "media/filters/chunk_demuxer_factory.h"
#include "media/filters/dummy_demuxer_factory.h"
@@ -131,7 +131,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
MessageLoop* pipeline_message_loop =
message_loop_factory_->GetMessageLoop("PipelineThread");
CHECK(pipeline_message_loop) << "Failed to create a new thread";
- pipeline_ = new media::PipelineImpl(pipeline_message_loop, media_log_);
+ pipeline_ = new media::Pipeline(pipeline_message_loop, media_log_);
pipeline_->Init(
base::Bind(&WebMediaPlayerProxy::PipelineEndedCallback,
proxy_.get()),
diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h
index 301a4f9..4481dda 100644
--- a/webkit/media/webmediaplayer_impl.h
+++ b/webkit/media/webmediaplayer_impl.h
@@ -3,15 +3,15 @@
// found in the LICENSE file.
// Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
-// It contains PipelineImpl which is the actual media player pipeline, it glues
+// It contains Pipeline which is the actual media player pipeline, it glues
// the media player pipeline, data source, audio renderer and renderer.
-// PipelineImpl would creates multiple threads and access some public methods
+// Pipeline would creates multiple threads and access some public methods
// of this class, so we need to be extra careful about concurrent access of
// methods and members.
//
// WebMediaPlayerImpl works with multiple objects, the most important ones are:
//
-// media::PipelineImpl
+// media::Pipeline
// The media playback pipeline.
//
// VideoRendererBase
@@ -26,7 +26,7 @@
// WebMediaPlayerClient (WebKit object)
// ^
// |
-// WebMediaPlayerImpl ---> PipelineImpl
+// WebMediaPlayerImpl ---> Pipeline
// | ^ |
// | | v r
// | | VideoRendererBase
diff --git a/webkit/media/webmediaplayer_proxy.h b/webkit/media/webmediaplayer_proxy.h
index e0bb200..31e05e5 100644
--- a/webkit/media/webmediaplayer_proxy.h
+++ b/webkit/media/webmediaplayer_proxy.h
@@ -58,7 +58,7 @@ class WebMediaPlayerProxy
bool HasSingleOrigin();
void AbortDataSources();
- // Methods for PipelineImpl -> WebMediaPlayerImpl communication.
+ // Methods for Pipeline -> WebMediaPlayerImpl communication.
void PipelineInitializationCallback(media::PipelineStatus status);
void PipelineSeekCallback(media::PipelineStatus status);
void PipelineEndedCallback(media::PipelineStatus status);