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

Side by Side Diff: media/media.gyp

Issue 1565623002: Replace WebAudio MediaCodec usage with FFmpeg. A ~4x improvement. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Delete expectations. Created 4 years, 11 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 1805 matching lines...) Expand 10 before | Expand all | Expand 10 after
1816 'target_name': 'media_android_jni_headers', 1816 'target_name': 'media_android_jni_headers',
1817 'type': 'none', 1817 'type': 'none',
1818 'sources': [ 1818 'sources': [
1819 'base/android/java/src/org/chromium/media/AudioManagerAndroid.java', 1819 'base/android/java/src/org/chromium/media/AudioManagerAndroid.java',
1820 'base/android/java/src/org/chromium/media/AudioRecordInput.java', 1820 'base/android/java/src/org/chromium/media/AudioRecordInput.java',
1821 'base/android/java/src/org/chromium/media/MediaCodecBridge.java', 1821 'base/android/java/src/org/chromium/media/MediaCodecBridge.java',
1822 'base/android/java/src/org/chromium/media/MediaCodecUtil.java', 1822 'base/android/java/src/org/chromium/media/MediaCodecUtil.java',
1823 'base/android/java/src/org/chromium/media/MediaDrmBridge.java', 1823 'base/android/java/src/org/chromium/media/MediaDrmBridge.java',
1824 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java', 1824 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java',
1825 'base/android/java/src/org/chromium/media/MediaPlayerListener.java', 1825 'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
1826 'base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.j ava',
1827 ], 1826 ],
1828 'variables': { 1827 'variables': {
1829 'jni_gen_package': 'media', 1828 'jni_gen_package': 'media',
1830 }, 1829 },
1831 'includes': ['../build/jni_generator.gypi'], 1830 'includes': ['../build/jni_generator.gypi'],
1832 }, 1831 },
1833 { 1832 {
1834 # GN: //media/base/android:video_capture_android_jni_headers 1833 # GN: //media/base/android:video_capture_android_jni_headers
1835 'target_name': 'video_capture_android_jni_headers', 1834 'target_name': 'video_capture_android_jni_headers',
1836 'type': 'none', 1835 'type': 'none',
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
1894 'base/android/media_statistics.cc', 1893 'base/android/media_statistics.cc',
1895 'base/android/media_statistics.h', 1894 'base/android/media_statistics.h',
1896 'base/android/media_task_runner.cc', 1895 'base/android/media_task_runner.cc',
1897 'base/android/media_task_runner.h', 1896 'base/android/media_task_runner.h',
1898 'base/android/media_url_interceptor.h', 1897 'base/android/media_url_interceptor.h',
1899 'base/android/provision_fetcher.h', 1898 'base/android/provision_fetcher.h',
1900 'base/android/sdk_media_codec_bridge.cc', 1899 'base/android/sdk_media_codec_bridge.cc',
1901 'base/android/sdk_media_codec_bridge.h', 1900 'base/android/sdk_media_codec_bridge.h',
1902 'base/android/video_decoder_job.cc', 1901 'base/android/video_decoder_job.cc',
1903 'base/android/video_decoder_job.h', 1902 'base/android/video_decoder_job.h',
1904 'base/android/webaudio_media_codec_bridge.cc',
1905 'base/android/webaudio_media_codec_bridge.h',
1906 'base/android/webaudio_media_codec_info.h',
1907 ], 1903 ],
1908 'conditions': [ 1904 'conditions': [
1909 # Only 64 bit builds are using android-21 NDK library, check common. gypi 1905 # Only 64 bit builds are using android-21 NDK library, check common. gypi
1910 ['target_arch=="arm64" or target_arch=="x64" or target_arch=="mips64 el"', { 1906 ['target_arch=="arm64" or target_arch=="x64" or target_arch=="mips64 el"', {
1911 'sources': [ 1907 'sources': [
1912 'base/android/ndk_media_codec_bridge.cc', 1908 'base/android/ndk_media_codec_bridge.cc',
1913 'base/android/ndk_media_codec_bridge.h', 1909 'base/android/ndk_media_codec_bridge.h',
1914 'base/android/ndk_media_codec_wrapper.cc', 1910 'base/android/ndk_media_codec_wrapper.cc',
1915 ], 1911 ],
1916 }], 1912 }],
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
2142 'dependencies': [ 2138 'dependencies': [
2143 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2139 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2144 ], 2140 ],
2145 }], 2141 }],
2146 ], 2142 ],
2147 }, 2143 },
2148 ], 2144 ],
2149 }], 2145 }],
2150 ], 2146 ],
2151 } 2147 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698