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

Unified Diff: webkit/glue/webmediaplayer_impl.h

Issue 6648004: DemuxerFactory is born! (Closed)
Patch Set: Created 9 years, 9 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
Index: webkit/glue/webmediaplayer_impl.h
diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h
index 03586932baca6e8894d3885b62a2f377d09608c1..0a31466428edb2f5781b0096f0f325f6c7b57de9 100644
--- a/webkit/glue/webmediaplayer_impl.h
+++ b/webkit/glue/webmediaplayer_impl.h
@@ -61,7 +61,7 @@
#include "base/synchronization/waitable_event.h"
#include "media/base/filters.h"
#include "media/base/message_loop_factory.h"
-#include "media/base/pipeline.h"
+#include "media/base/pipeline_impl.h"
#include "skia/ext/platform_canvas.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h"
@@ -302,7 +302,7 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer,
scoped_ptr<media::FilterCollection> filter_collection_;
// The actual pipeline and the thread it runs on.
- scoped_refptr<media::Pipeline> pipeline_;
+ scoped_refptr<media::PipelineImpl> pipeline_;
acolwell GONE FROM CHROMIUM 2011/03/08 21:48:09 I don't think this will be needed once the demuxer
Ami GONE FROM CHROMIUM 2011/03/08 22:44:48 Done.
scoped_ptr<media::MessageLoopFactory> message_loop_factory_;

Powered by Google App Engine
This is Rietveld 408576698