DemuxerFactory is born!

media/tools/player_x11/player_x11.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 <iostream>
 #include <signal.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/scoped_ptr.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread.h"
 #include "media/base/callback.h"
 #include "media/base/filter_collection.h"
 #include "media/base/media.h"
 #include "media/base/media_switches.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/filters/omx_video_decoder.h"
 
 // TODO(jiesun): implement different video decode contexts according to
 // these flags. e.g.
 //     1.  system memory video decode context for x11
 //     2.  gl texture video decode context for OpenGL.
 //     3.  gles texture video decode context for OpenGLES.
@@ skipping 58 matching lines @@
     std::cout << "Unable to initialize OpenMAX library."<< std::endl;
     return false;
   }
 
   // Load media libraries.
   if (!media::InitializeMediaLibrary(FilePath())) {
     std::cout << "Unable to initialize the media library." << std::endl;
     return false;
   }
 
+  // Create the pipeline.
+  *pipeline = new media::PipelineImpl(message_loop);

[acolwell GONE FROM CHROMIUM, 2011/03/08 21:48:09]

Move back if FFmpegDemuxerFactory doesn't need FilterHost.

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

Done.

+
   // 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, pipeline->get()));
   collection->AddAudioDecoder(new media::FFmpegAudioDecoder(
       message_loop_factory->GetMessageLoop("AudioDecoderThread")));
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableOpenMax)) {
     collection->AddVideoDecoder(new media::OmxVideoDecoder(
         message_loop_factory->GetMessageLoop("VideoDecoderThread"),
         NULL));
   } else {
     collection->AddVideoDecoder(new media::FFmpegVideoDecoder(
         message_loop_factory->GetMessageLoop("VideoDecoderThread"),
         NULL));
   }
   collection->AddVideoRenderer(new Renderer(g_display,
                                             g_window,
                                             paint_message_loop));
 
   if (enable_audio)
     collection->AddAudioRenderer(new media::AudioRendererImpl());
   else
     collection->AddAudioRenderer(new media::NullAudioRenderer());
 
-  // Creates the pipeline and start it.
-  *pipeline = new media::PipelineImpl(message_loop);
+  // Start the pipeline.
   (*pipeline)->Start(collection.release(), filename, NULL);
 
   // Wait until the pipeline is fully initialized.
   while (true) {
     base::PlatformThread::Sleep(100);
     if ((*pipeline)->IsInitialized())
       break;
     if ((*pipeline)->GetError() != media::PIPELINE_OK) {
+      std::cout << "InitPipeline: " << (*pipeline)->GetError() << std::endl;

[acolwell GONE FROM CHROMIUM, 2011/03/08 21:48:09]

remove

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

Keeping; it's useful for figuring out what went wrong (otherwise all you get is
the "Pipeline initialization failed" from line 279 and nothing else).

[acolwell GONE FROM CHROMIUM, 2011/03/08 23:19:00]

Sounds good to me.

       (*pipeline)->Stop(NULL);
       return false;
     }
   }
 
   // And starts the playback.
   (*pipeline)->SetPlaybackRate(1.0f);
   return true;
 }
 
@@ skipping 127 matching lines @@
   }
 
   // Cleanup tasks.
   message_loop_factory.reset();
 
   thread->Stop();
   XDestroyWindow(g_display, g_window);
   XCloseDisplay(g_display);
   return 0;
 }