summaryrefslogtreecommitdiffstats
path: root/media/omx
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-24 23:14:23 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-24 23:14:23 +0000
commit3cfcae2bed49e80e31fbedf4e2ed45c594e7b941 (patch)
treefaf29a47484c7c757bddd1b3ccdf1bdc85215fb4 /media/omx
parent8e81776b35b83f86b749445239efe36f7c8dc1e0 (diff)
downloadchromium_src-3cfcae2bed49e80e31fbedf4e2ed45c594e7b941.zip
chromium_src-3cfcae2bed49e80e31fbedf4e2ed45c594e7b941.tar.gz
chromium_src-3cfcae2bed49e80e31fbedf4e2ed45c594e7b941.tar.bz2
Revert "Implement method stubs for OpenMAX IL instead of relying on -lOmxCore."
Review URL: http://codereview.chromium.org/431040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32993 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/omx')
-rw-r--r--media/omx/omx_test.cc3
-rw-r--r--media/omx/omx_test.gyp30
2 files changed, 31 insertions, 2 deletions
diff --git a/media/omx/omx_test.cc b/media/omx/omx_test.cc
index bb4ffd2..306a2fd 100644
--- a/media/omx/omx_test.cc
+++ b/media/omx/omx_test.cc
@@ -12,7 +12,6 @@
#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"
@@ -90,7 +89,7 @@ class TestApp {
void Run() {
// Open the input file.
- file_ = file_util::OpenFile(filename_, "rb");
+ file_ = fopen(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
new file mode 100644
index 0000000..0e2fcaa
--- /dev/null
+++ b/media/omx/omx_test.gyp
@@ -0,0 +1,30 @@
+# 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',
+ ],
+ },
+ ],
+ }],
+ ],
+}