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

Side by Side Diff: media/media.gyp

Issue 1472943002: Refactor MediaCodecBridge to add support for NDK APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 1177 matching lines...) Expand 10 before | Expand all | Expand 10 after
1188 '../testing/gmock.gyp:gmock', 1188 '../testing/gmock.gyp:gmock',
1189 '../testing/gtest.gyp:gtest', 1189 '../testing/gtest.gyp:gtest',
1190 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', 1190 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
1191 '../ui/gfx/gfx.gyp:gfx', 1191 '../ui/gfx/gfx.gyp:gfx',
1192 '../ui/gfx/gfx.gyp:gfx_geometry', 1192 '../ui/gfx/gfx.gyp:gfx_geometry',
1193 '../ui/gfx/gfx.gyp:gfx_test_support', 1193 '../ui/gfx/gfx.gyp:gfx_test_support',
1194 '../url/url.gyp:url_lib', 1194 '../url/url.gyp:url_lib',
1195 ], 1195 ],
1196 'sources': [ 1196 'sources': [
1197 'base/android/access_unit_queue_unittest.cc', 1197 'base/android/access_unit_queue_unittest.cc',
1198 'base/android/media_codec_bridge_unittest.cc',
1199 'base/android/media_codec_decoder_unittest.cc', 1198 'base/android/media_codec_decoder_unittest.cc',
1200 'base/android/media_codec_player_unittest.cc', 1199 'base/android/media_codec_player_unittest.cc',
1201 'base/android/media_drm_bridge_unittest.cc', 1200 'base/android/media_drm_bridge_unittest.cc',
1202 'base/android/media_player_bridge_unittest.cc', 1201 'base/android/media_player_bridge_unittest.cc',
1203 'base/android/media_source_player_unittest.cc', 1202 'base/android/media_source_player_unittest.cc',
1203 'base/android/sdk_media_codec_bridge_unittest.cc',
1204 'base/android/test_data_factory.cc', 1204 'base/android/test_data_factory.cc',
1205 'base/android/test_data_factory.h', 1205 'base/android/test_data_factory.h',
1206 'base/android/test_statistics.h', 1206 'base/android/test_statistics.h',
1207 'base/audio_block_fifo_unittest.cc', 1207 'base/audio_block_fifo_unittest.cc',
1208 'base/audio_buffer_converter_unittest.cc', 1208 'base/audio_buffer_converter_unittest.cc',
1209 'base/audio_buffer_queue_unittest.cc', 1209 'base/audio_buffer_queue_unittest.cc',
1210 'base/audio_buffer_unittest.cc', 1210 'base/audio_buffer_unittest.cc',
1211 'base/audio_bus_unittest.cc', 1211 'base/audio_bus_unittest.cc',
1212 'base/audio_converter_unittest.cc', 1212 'base/audio_converter_unittest.cc',
1213 'base/audio_discard_helper_unittest.cc', 1213 'base/audio_discard_helper_unittest.cc',
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
1820 'includes': ['../build/apk_test.gypi'], 1820 'includes': ['../build/apk_test.gypi'],
1821 }, 1821 },
1822 { 1822 {
1823 # GN: //media/base/android:media_android_jni_headers 1823 # GN: //media/base/android:media_android_jni_headers
1824 'target_name': 'media_android_jni_headers', 1824 'target_name': 'media_android_jni_headers',
1825 'type': 'none', 1825 'type': 'none',
1826 'sources': [ 1826 'sources': [
1827 'base/android/java/src/org/chromium/media/AudioManagerAndroid.java', 1827 'base/android/java/src/org/chromium/media/AudioManagerAndroid.java',
1828 'base/android/java/src/org/chromium/media/AudioRecordInput.java', 1828 'base/android/java/src/org/chromium/media/AudioRecordInput.java',
1829 'base/android/java/src/org/chromium/media/MediaCodecBridge.java', 1829 'base/android/java/src/org/chromium/media/MediaCodecBridge.java',
1830 'base/android/java/src/org/chromium/media/MediaCodecUtil.java',
1830 'base/android/java/src/org/chromium/media/MediaDrmBridge.java', 1831 'base/android/java/src/org/chromium/media/MediaDrmBridge.java',
1831 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java', 1832 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java',
1832 'base/android/java/src/org/chromium/media/MediaPlayerListener.java', 1833 'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
1833 'base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.j ava', 1834 'base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.j ava',
1834 ], 1835 ],
1835 'variables': { 1836 'variables': {
1836 'jni_gen_package': 'media', 1837 'jni_gen_package': 'media',
1837 }, 1838 },
1838 'includes': ['../build/jni_generator.gypi'], 1839 'includes': ['../build/jni_generator.gypi'],
1839 }, 1840 },
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
1895 'base/android/media_resource_getter.cc', 1896 'base/android/media_resource_getter.cc',
1896 'base/android/media_resource_getter.h', 1897 'base/android/media_resource_getter.h',
1897 'base/android/media_source_player.cc', 1898 'base/android/media_source_player.cc',
1898 'base/android/media_source_player.h', 1899 'base/android/media_source_player.h',
1899 'base/android/media_statistics.cc', 1900 'base/android/media_statistics.cc',
1900 'base/android/media_statistics.h', 1901 'base/android/media_statistics.h',
1901 'base/android/media_task_runner.cc', 1902 'base/android/media_task_runner.cc',
1902 'base/android/media_task_runner.h', 1903 'base/android/media_task_runner.h',
1903 'base/android/media_url_interceptor.h', 1904 'base/android/media_url_interceptor.h',
1904 'base/android/provision_fetcher.h', 1905 'base/android/provision_fetcher.h',
1906 'base/android/sdk_media_codec_bridge.cc',
1907 'base/android/sdk_media_codec_bridge.h',
1905 'base/android/video_decoder_job.cc', 1908 'base/android/video_decoder_job.cc',
1906 'base/android/video_decoder_job.h', 1909 'base/android/video_decoder_job.h',
1907 'base/android/webaudio_media_codec_bridge.cc', 1910 'base/android/webaudio_media_codec_bridge.cc',
1908 'base/android/webaudio_media_codec_bridge.h', 1911 'base/android/webaudio_media_codec_bridge.h',
1909 'base/android/webaudio_media_codec_info.h', 1912 'base/android/webaudio_media_codec_info.h',
1910 ], 1913 ],
1914 'conditions': [
1915 ['target_arch=="arm64" or target_arch=="x64" or target_arch=="mips64 el"', {
1916 'sources': [
1917 'base/android/ndk_media_codec_bridge.cc',
1918 'base/android/ndk_media_codec_bridge.h',
1919 ],
1920 'link_settings': {
1921 'libraries': [
1922 '-lmediandk',
1923 ],
1924 },
1925 }],
1926 ],
1911 'dependencies': [ 1927 'dependencies': [
1912 '../base/base.gyp:base', 1928 '../base/base.gyp:base',
1913 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h ', 1929 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h ',
1914 '../ui/gl/gl.gyp:gl', 1930 '../ui/gl/gl.gyp:gl',
1915 '../url/url.gyp:url_lib', 1931 '../url/url.gyp:url_lib',
1916 'media_android_jni_headers', 1932 'media_android_jni_headers',
1917 ], 1933 ],
1918 'include_dirs': [ 1934 'include_dirs': [
1919 # Needed by media_drm_bridge.cc. 1935 # Needed by media_drm_bridge.cc.
1920 '<(SHARED_INTERMEDIATE_DIR)', 1936 '<(SHARED_INTERMEDIATE_DIR)',
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
2133 'dependencies': [ 2149 'dependencies': [
2134 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2150 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2135 ], 2151 ],
2136 }], 2152 }],
2137 ], 2153 ],
2138 }, 2154 },
2139 ], 2155 ],
2140 }], 2156 }],
2141 ], 2157 ],
2142 } 2158 }
OLDNEW
« media/base/android/sdk_media_codec_bridge.h ('K') | « media/base/android/video_decoder_job.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698