Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1324)

Unified Diff: media/media.gyp

Issue 12457043: Android implementation of WebAudio audio file decoder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/media_android.cc ('k') | webkit/glue/webkitplatformsupport_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 3007e2030bb9ac465a5034aa64faa78e419aaa16..2715d8656af90b553b847ce6d95ccb25956425a4 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -560,9 +560,6 @@
},
}],
['OS == "android"', {
- 'sources': [
- 'base/media_stub.cc',
- ],
'link_settings': {
'libraries': [
'-lOpenSLES',
@@ -582,7 +579,21 @@
'media_java',
],
}],
- ]
+ ['use_openmax_dl_fft==1', {
+ # FFT library requires Neon support, so we enable
+ # WebAudio only if Neon is detected at runtime.
+ 'sources': [
+ 'base/media_android.cc',
+ ],
+ 'includes': [
+ '../build/android/cpufeatures.gypi',
+ ],
+ }, {
+ 'sources': [
+ 'base/media_stub.cc',
+ ],
+ }],
+ ],
}],
# A simple WebM encoder for animated avatars on ChromeOS.
['chromeos==1', {
@@ -1446,7 +1457,7 @@
}],
['OS == "android"', {
'targets': [
- {
+ {
'target_name': 'media_player_jni_headers',
'type': 'none',
'variables': {
@@ -1465,6 +1476,7 @@
'base/android/java/src/org/chromium/media/AudioManagerAndroid.java',
'base/android/java/src/org/chromium/media/MediaPlayerBridge.java',
'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
+ 'base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java',
],
'variables': {
'jni_gen_package': 'media',
@@ -1512,6 +1524,8 @@
'base/android/media_player_bridge.h',
'base/android/media_player_listener.cc',
'base/android/media_player_listener.h',
+ 'base/android/webaudio_media_codec_bridge.cc',
+ 'base/android/webaudio_media_codec_bridge.h',
],
'dependencies': [
'../base/base.gyp:base',
« no previous file with comments | « media/base/media_android.cc ('k') | webkit/glue/webkitplatformsupport_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698