DemuxerFactory is born!

webkit/glue/webmediaplayer_impl.h

 // Copyright (c) 2010 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.
 
 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
 // It contains PipelineImpl 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
 // of this class, so we need to be extra careful about concurrent access of
 // methods and members.
@@ skipping 43 matching lines @@
 #define WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_
 
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/threading/thread.h"
 #include "base/synchronization/lock.h"
 #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"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "webkit/glue/media/web_data_source.h"
 
 class GURL;
 
 namespace WebKit {
@@ skipping 220 matching lines @@
   WebKit::WebTimeRanges buffered_;
 
   // Message loops for posting tasks between Chrome's main thread. Also used
   // for DCHECKs so methods calls won't execute in the wrong thread.
   MessageLoop* main_loop_;
 
   // A collection of filters.
   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 factory doesn't require a
FilterHost.

[Ami GONE FROM CHROMIUM, 2011/03/08 22:44:48]

Done.

 
   scoped_ptr<media::MessageLoopFactory> message_loop_factory_;
 
   // Playback state.
   //
   // TODO(scherkus): we have these because Pipeline favours the simplicity of a
   // single "playback rate" over worrying about paused/stopped etc...  It forces
   // all clients to manage the pause+playback rate externally, but is that
   // really a bad thing?
   //
@@ skipping 17 matching lines @@
 #if WEBKIT_USING_CG
   scoped_ptr<skia::PlatformCanvas> skia_canvas_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
 }  // namespace webkit_glue
 
 #endif  // WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_