DemuxerFactory is born!

media/tools/player_wtl/movie.cc

 // 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.
 
 #include "media/tools/player_wtl/movie.h"
 
 #include "base/singleton.h"
 #include "base/threading/platform_thread.h"
 #include "base/utf_string_conversions.h"
 #include "media/base/filter_collection.h"
 #include "media/base/message_loop_factory_impl.h"
 #include "media/base/pipeline_impl.h"
 #include "media/filters/audio_renderer_impl.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
-#include "media/filters/ffmpeg_demuxer.h"
+#include "media/filters/ffmpeg_demuxer_factory.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/file_data_source_factory.h"
 #include "media/filters/null_audio_renderer.h"
 #include "media/tools/player_wtl/wtl_renderer.h"
 
 using media::AudioRendererImpl;
 using media::FFmpegAudioDecoder;
-using media::FFmpegDemuxer;
+using media::FFmpegDemuxerFactory;
 using media::FFmpegVideoDecoder;
 using media::FileDataSourceFactory;
 using media::FilterCollection;
 using media::PipelineImpl;
 
 namespace media {
 
 Movie::Movie()
     : enable_audio_(true),
       enable_draw_(true),
@@ skipping 22 matching lines @@
 }
 
 bool Movie::Open(const wchar_t* url, WtlVideoRenderer* video_renderer) {
   // Close previous movie.
   if (pipeline_) {
     Close();
   }
 
   message_loop_factory_.reset(new media::MessageLoopFactoryImpl());
 
+  MessageLoop* pipeline_loop =
+      message_loop_factory_->GetMessageLoop("PipelineThread");
+  pipeline_ = new PipelineImpl(pipeline_loop);
+
   // Create filter collection.
   scoped_ptr<FilterCollection> collection(new FilterCollection());
-  collection->SetDataSourceFactory(new FileDataSourceFactory());
+  collection->SetDemuxerFactory(new FFmpegDemuxerFactory(
+      new FileDataSourceFactory(), pipeline_loop));
   collection->AddAudioDecoder(new FFmpegAudioDecoder(
       message_loop_factory_->GetMessageLoop("AudioDecoderThread")));
-  collection->AddDemuxer(new FFmpegDemuxer(
-      message_loop_factory_->GetMessageLoop("DemuxThread")));
   collection->AddVideoDecoder(new FFmpegVideoDecoder(
       message_loop_factory_->GetMessageLoop("VideoDecoderThread"), NULL));
 
   if (enable_audio_) {
     collection->AddAudioRenderer(new AudioRendererImpl());
   } else {
     collection->AddAudioRenderer(new media::NullAudioRenderer());
   }
   collection->AddVideoRenderer(video_renderer);
 
-  pipeline_ = new PipelineImpl(
-      message_loop_factory_->GetMessageLoop("PipelineThread"));
-
   // Create and start our pipeline.
   pipeline_->Start(collection.release(), WideToUTF8(std::wstring(url)), NULL);
   while (true) {
     base::PlatformThread::Sleep(100);
     if (pipeline_->IsInitialized())
       break;
     if (pipeline_->GetError() != media::PIPELINE_OK)
       return false;
   }
   pipeline_->SetPlaybackRate(play_rate_);
@@ skipping 77 matching lines @@
 void Movie::Close() {
   if (pipeline_) {
     pipeline_->Stop(NULL);
     pipeline_ = NULL;
   }
 
   message_loop_factory_.reset();
 }
 
 }  // namespace media