diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-03 16:33:56 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-03 16:33:56 +0000 |
| commit | ef03875e8fab7be527abe1c890d420b1fedc58f6 (patch) | |
| tree | e6b00dd59a5ba859a88e3e65e38237a9ef162c6d /media/tools/player_x11 | |
| parent | 6556c953778fcd26f9b2ddd817be926cfd9ca191 (diff) | |
| download | chromium_src-ef03875e8fab7be527abe1c890d420b1fedc58f6.zip chromium_src-ef03875e8fab7be527abe1c890d420b1fedc58f6.tar.gz chromium_src-ef03875e8fab7be527abe1c890d420b1fedc58f6.tar.bz2 | |
Revert 87790 - Removing defunct OpenMAX code.
All of this code hasn't been used in over a year and has been replaced by VideoDecodeAccelerator and it's corresponding OpenMAX implementation OmxVideoDecodeAccelerator.
BUG=none
TEST=the world still compiles
Review URL: http://codereview.chromium.org/7066071
TBR=scherkus@chromium.org
Review URL: http://codereview.chromium.org/7065060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87793 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools/player_x11')
| -rw-r--r-- | media/tools/player_x11/player_x11.cc | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index 590306b..42b30438 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -26,6 +26,7 @@ #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. @@ -94,6 +95,14 @@ bool InitPipeline(MessageLoop* message_loop, scoped_refptr<media::PipelineImpl>* pipeline, MessageLoop* paint_message_loop, media::MessageLoopFactory* message_loop_factory) { + // Initialize OpenMAX. + if (CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableOpenMax) && + !media::InitializeOpenMaxLibrary(FilePath())) { + 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; @@ -109,9 +118,16 @@ bool InitPipeline(MessageLoop* message_loop, new media::FileDataSourceFactory(), message_loop))); collection->AddAudioDecoder(new media::FFmpegAudioDecoder( message_loop_factory->GetMessageLoop("AudioDecoderThread"))); - collection->AddVideoDecoder(new media::FFmpegVideoDecoder( - message_loop_factory->GetMessageLoop("VideoDecoderThread"), - NULL)); + 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)); @@ -218,6 +234,7 @@ int main(int argc, char** argv) { std::cout << "Usage: " << argv[0] << " --file=FILE" << std::endl << std::endl << "Optional arguments:" << std::endl + << " [--enable-openmax]" << " [--audio]" << " [--alsa-device=DEVICE]" << std::endl << " Press [ESC] to stop" << std::endl |