summaryrefslogtreecommitdiffstats
path: root/content/content_tests.gypi
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-22 04:27:52 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-22 04:27:52 +0000
commitd0ec2fa2d8f7a542d6759b0964036744764adca7 (patch)
tree9b420b0aaedd85ae4835bcdcc261b6451a64de75 /content/content_tests.gypi
parent01eb8ab2badce7c4746dcb34f97654a28d79b870 (diff)
downloadchromium_src-d0ec2fa2d8f7a542d6759b0964036744764adca7.zip
chromium_src-d0ec2fa2d8f7a542d6759b0964036744764adca7.tar.gz
chromium_src-d0ec2fa2d8f7a542d6759b0964036744764adca7.tar.bz2
Revert 115482 - Initial implementation of the DXVA 2.0 H.264 hardware decoder for pepper for Windows. The decoding is done
using the Microsoft Media Foundation API. To render the output bitmap on the GPU texture we create a temporary Direct3D surface in the RGB format and copy the decoded contents to this surface. This will change once we have an ANGLE extension which allows us to pass the decoded surface as is for rendering. We do the following prior to initializing the GPU sandbox:- 1. Load necessary decoding dlls. 2. Create static instances of the IDirect3DDeviceManager9 and the IDirect3DDevice9Ex interfaces. These are shared among all decoder instances. This work is done in the PreSandboxInitialization function in the DXVAVideoDecodeAccelerator class. We cannot use CoCreateInstance to instantiate the h.264 decoder as that fails in the sandbox. Instead we do the donkey work of loading the dll and using DllGetClassObject to instantiate the decoder. BUG=none TEST=Refactored the omx_video_decode_accelerator_unittest.cc test to ensure it works on Windows and Chrome OS. This file has been renamed as video_decode_accelerator_unittest.cc as it now works on both windows and cros. Review URL: http://codereview.chromium.org/8510039 TBR=ananta@chromium.org Review URL: http://codereview.chromium.org/9024001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115483 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_tests.gypi')
-rw-r--r--content/content_tests.gypi20
1 files changed, 4 insertions, 16 deletions
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index fcddd70..e8e36c0 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -402,23 +402,10 @@
},
],
'conditions': [
- ['target_arch=="arm" or OS=="win"', {
+ ['target_arch=="arm"', {
'targets': [
{
- 'conditions': [
- ['target_arch=="arm"', {
- 'target_name': 'omx_video_decode_accelerator_unittest',
- 'include_dirs': [
- '<(DEPTH)/third_party/openmax/il',
- ],
- }],
- ['OS=="win"', {
- 'target_name': 'dxva_video_decode_accelerator_unittest',
- 'dependencies': [
- '../base/allocator/allocator.gyp:allocator',
- ],
- }],
- ],
+ 'target_name': 'omx_video_decode_accelerator_unittest',
'defines!': ['CONTENT_IMPLEMENTATION'],
'type': 'executable',
'dependencies': [
@@ -428,9 +415,10 @@
],
'include_dirs': [
'<(DEPTH)/third_party/angle/include',
+ '<(DEPTH)/third_party/openmax/il',
],
'sources': [
- 'common/gpu/media/video_decode_accelerator_unittest.cc',
+ 'common/gpu/media/omx_video_decode_accelerator_unittest.cc',
],
}
],