Remove DemuxerFactory and URL parameter from Pipeline.

media/tools/player_wtl/movie.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/memory/singleton.h"
 #include "base/threading/platform_thread.h"
 #include "base/utf_string_conversions.h"
 #include "media/audio/audio_manager.h"
 #include "media/base/filter_collection.h"
 #include "media/base/media_log.h"
 #include "media/base/message_loop_factory.h"
 #include "media/base/pipeline.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
-#include "media/filters/ffmpeg_demuxer_factory.h"
+#include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/file_data_source.h"
 #include "media/filters/null_audio_renderer.h"
 #include "media/filters/video_renderer_base.h"
 
 using media::FFmpegAudioDecoder;
-using media::FFmpegDemuxerFactory;
+using media::FFmpegDemuxer;
 using media::FFmpegVideoDecoder;
 using media::FileDataSource;
 using media::FilterCollection;
 using media::Pipeline;
 
 namespace media {
 
 Movie::Movie()
     : audio_manager_(AudioManager::Create()),
       enable_audio_(false),
@@ skipping 36 matching lines @@
 
   // Open the file.
   std::string url_utf8 = WideToUTF8(string16(url));
   scoped_refptr<FileDataSource> data_source = new FileDataSource();
   if (data_source->Initialize(url_utf8) != PIPELINE_OK) {
     return false;
   }
 
   // Create filter collection.
   scoped_ptr<FilterCollection> collection(new FilterCollection());
-  collection->SetDemuxerFactory(scoped_ptr<DemuxerFactory>(
-      new FFmpegDemuxerFactory(data_source, pipeline_loop)));
+  collection->SetDemuxer(new FFmpegDemuxer(
+      pipeline_loop, data_source, true));
   collection->AddAudioDecoder(new FFmpegAudioDecoder(
       base::Bind(&MessageLoopFactory::GetMessageLoop,
                  base::Unretained(message_loop_factory_.get()),
                  "AudioDecoderThread")));
   collection->AddVideoDecoder(new FFmpegVideoDecoder(
       base::Bind(&MessageLoopFactory::GetMessageLoop,
                  base::Unretained(message_loop_factory_.get()),
                  "VideoDecoderThread")));
 
   // TODO(vrk): Re-enabled audio. (crbug.com/112159)
   collection->AddAudioRenderer(new media::NullAudioRenderer());
   collection->AddVideoRenderer(video_renderer);
 
   // Create and start our pipeline.
   media::PipelineStatusNotification note;
   pipeline_->Start(
       collection.Pass(),
-      url_utf8,
       media::PipelineStatusCB(),
       media::PipelineStatusCB(),
       media::NetworkEventCB(),
       note.Callback());
 
   // Wait until the pipeline is fully initialized.
   note.Wait();
   if (note.status() != PIPELINE_OK)
     return false;
   pipeline_->SetPlaybackRate(play_rate_);
@@ skipping 76 matching lines @@
 void Movie::Close() {
   if (pipeline_) {
     pipeline_->Stop(base::Closure());
     pipeline_ = NULL;
   }
 
   message_loop_factory_.reset();
 }
 
 }  // namespace media