diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-24 22:38:53 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-24 22:38:53 +0000 |
| commit | 3e1a292b64b685d64f119b8a138dd0be85611b8b (patch) | |
| tree | 4cdecb1d1fbb9e620fb88995b748d5f153faefd1 /media/omx | |
| parent | faed6e1304f7ba31ed12d42ea3dc694021690afd (diff) | |
| download | chromium_src-3e1a292b64b685d64f119b8a138dd0be85611b8b.zip chromium_src-3e1a292b64b685d64f119b8a138dd0be85611b8b.tar.gz chromium_src-3e1a292b64b685d64f119b8a138dd0be85611b8b.tar.bz2 | |
Implement method stubs for OpenMAX IL instead of relying on -lOmxCore.
You can switch to using -lOmxCore by setting the gyp variable use_system_openmax=1.
BUG=28663
TEST=building omx_test should have no linker errors
Review URL: http://codereview.chromium.org/436021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/omx')
| -rw-r--r-- | media/omx/omx_test.cc | 3 | ||||
| -rw-r--r-- | media/omx/omx_test.gyp | 30 |
2 files changed, 2 insertions, 31 deletions
diff --git a/media/omx/omx_test.cc b/media/omx/omx_test.cc index 306a2fd..bb4ffd2 100644 --- a/media/omx/omx_test.cc +++ b/media/omx/omx_test.cc @@ -12,6 +12,7 @@ #include "base/at_exit.h" #include "base/command_line.h" +#include "base/file_util.h" #include "base/message_loop.h" #include "base/scoped_ptr.h" #include "media/omx/input_buffer.h" @@ -89,7 +90,7 @@ class TestApp { void Run() { // Open the input file. - file_ = fopen(filename_, "rb"); + file_ = file_util::OpenFile(filename_, "rb"); if (!file_) { printf("Error - can't open file %s\n", filename_); return; diff --git a/media/omx/omx_test.gyp b/media/omx/omx_test.gyp deleted file mode 100644 index 0e2fcaa..0000000 --- a/media/omx/omx_test.gyp +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (c) 2009 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. - -{ - 'variables': { - 'chromium_code': 1, - }, - 'conditions': [ - ['OS=="linux"', { - 'targets' : [ - { - 'target_name': 'omx_test', - 'type': 'executable', - 'dependencies': [ - '../../base/base.gyp:base', - '../../third_party/openmax/openmax.gyp:il', - ], - 'sources': [ - 'input_buffer.cc', - 'input_buffer.h', - 'omx_test.cc', - 'omx_video_decoder.cc', - 'omx_video_decoder.h', - ], - }, - ], - }], - ], -} |