diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-23 02:11:44 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-23 02:11:44 +0000 |
| commit | 71a418ccaceeea49dc8049b01a17a501e8070157 (patch) | |
| tree | 28a9be5d04adb0d99e5acc28b037eda5933e8542 /media/tools | |
| parent | 13347d1506a5a5174bbe39099dc93041f1d0a497 (diff) | |
| download | chromium_src-71a418ccaceeea49dc8049b01a17a501e8070157.zip chromium_src-71a418ccaceeea49dc8049b01a17a501e8070157.tar.gz chromium_src-71a418ccaceeea49dc8049b01a17a501e8070157.tar.bz2 | |
Use OpenMAX for video decoding in the media pipeline
This patch is to fix some issues when using OpenMAX video decoder
in the media pipeline. It will enable player_x11 to decode using
OpenMAX.
This still requires some more work to enable Chrome to use
OpenMAX for decoding.
Review URL: http://codereview.chromium.org/549124
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/player_x11/player_x11.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index 7cba68f..aa8194b 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -1,6 +1,6 @@ -// 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. +// Copyright (c) 2009-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> @@ -106,8 +106,13 @@ void TerminateHandler(int signal) { int main(int argc, char** argv) { // Read arguments. if (argc == 1) { - std::cout << "Usage: " << argv[0] << " --file=FILE [--audio]" - " [--alsa-device=DEVICE]" << std::endl; + std::cout << "Usage: " << argv[0] << " --file=FILE" << std::endl + << std::endl + << "Optional arguments:" << std::endl + << " [--enable-openmax]" + << " [--enable-h264-annexb-filter]" + << " [--audio]" + << " [--alsa-device=DEVICE]" << std::endl; return 1; } |