Index: media/tools/player_x11/player_x11.cc |
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc |
index ea88c6594e4c5c617d2ac069853313c9a0268582..84c2ff137424a09d940e2b20ba74c4e5312ed002 100644 |
--- a/media/tools/player_x11/player_x11.cc |
+++ b/media/tools/player_x11/player_x11.cc |
@@ -21,7 +21,7 @@ |
#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" |
@@ -103,9 +103,8 @@ bool InitPipeline(MessageLoop* message_loop, |
// Create our filter factories. |
scoped_ptr<media::FilterCollection> collection( |
new media::FilterCollection()); |
- collection->SetDataSourceFactory(new media::FileDataSourceFactory()); |
- collection->AddDemuxer(new media::FFmpegDemuxer( |
- message_loop_factory->GetMessageLoop("DemuxThread"))); |
+ collection->SetDemuxerFactory(new media::FFmpegDemuxerFactory( |
+ new media::FileDataSourceFactory(), message_loop)); |
collection->AddAudioDecoder(new media::FFmpegAudioDecoder( |
message_loop_factory->GetMessageLoop("AudioDecoderThread"))); |
if (CommandLine::ForCurrentProcess()->HasSwitch( |
@@ -127,7 +126,7 @@ bool InitPipeline(MessageLoop* message_loop, |
else |
collection->AddAudioRenderer(new media::NullAudioRenderer()); |
- // Creates the pipeline and start it. |
+ // Create and start the pipeline. |
*pipeline = new media::PipelineImpl(message_loop); |
(*pipeline)->Start(collection.release(), filename, NULL); |
@@ -137,6 +136,7 @@ bool InitPipeline(MessageLoop* message_loop, |
if ((*pipeline)->IsInitialized()) |
break; |
if ((*pipeline)->GetError() != media::PIPELINE_OK) { |
+ std::cout << "InitPipeline: " << (*pipeline)->GetError() << std::endl; |
(*pipeline)->Stop(NULL); |
return false; |
} |