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

Side by Side Diff: media/media.gyp

Issue 308073004: Add PlayerTracker and BrowserCdm interfaces. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments addressed Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « media/cdm/player_tracker_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 'base/media_log_event.h', 291 'base/media_log_event.h',
292 'base/media_posix.cc', 292 'base/media_posix.cc',
293 'base/media_switches.cc', 293 'base/media_switches.cc',
294 'base/media_switches.h', 294 'base/media_switches.h',
295 'base/media_win.cc', 295 'base/media_win.cc',
296 'base/multi_channel_resampler.cc', 296 'base/multi_channel_resampler.cc',
297 'base/multi_channel_resampler.h', 297 'base/multi_channel_resampler.h',
298 'base/pipeline.cc', 298 'base/pipeline.cc',
299 'base/pipeline.h', 299 'base/pipeline.h',
300 'base/pipeline_status.h', 300 'base/pipeline_status.h',
301 'base/player_tracker.cc',
302 'base/player_tracker.h',
301 'base/ranges.cc', 303 'base/ranges.cc',
302 'base/ranges.h', 304 'base/ranges.h',
303 'base/sample_format.cc', 305 'base/sample_format.cc',
304 'base/sample_format.h', 306 'base/sample_format.h',
305 'base/scoped_histogram_timer.h', 307 'base/scoped_histogram_timer.h',
306 'base/seekable_buffer.cc', 308 'base/seekable_buffer.cc',
307 'base/seekable_buffer.h', 309 'base/seekable_buffer.h',
308 'base/serial_runner.cc', 310 'base/serial_runner.cc',
309 'base/serial_runner.h', 311 'base/serial_runner.h',
310 'base/simd/convert_rgb_to_yuv.h', 312 'base/simd/convert_rgb_to_yuv.h',
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 'base/video_util.cc', 350 'base/video_util.cc',
349 'base/video_util.h', 351 'base/video_util.h',
350 'base/yuv_convert.cc', 352 'base/yuv_convert.cc',
351 'base/yuv_convert.h', 353 'base/yuv_convert.h',
352 'cdm/aes_decryptor.cc', 354 'cdm/aes_decryptor.cc',
353 'cdm/aes_decryptor.h', 355 'cdm/aes_decryptor.h',
354 'cdm/json_web_key.cc', 356 'cdm/json_web_key.cc',
355 'cdm/json_web_key.h', 357 'cdm/json_web_key.h',
356 'cdm/key_system_names.cc', 358 'cdm/key_system_names.cc',
357 'cdm/key_system_names.h', 359 'cdm/key_system_names.h',
360 'cdm/player_tracker_impl.cc',
361 'cdm/player_tracker_impl.h',
358 'ffmpeg/ffmpeg_common.cc', 362 'ffmpeg/ffmpeg_common.cc',
359 'ffmpeg/ffmpeg_common.h', 363 'ffmpeg/ffmpeg_common.h',
360 'ffmpeg/ffmpeg_deleters.h', 364 'ffmpeg/ffmpeg_deleters.h',
361 'filters/audio_clock.cc', 365 'filters/audio_clock.cc',
362 'filters/audio_clock.h', 366 'filters/audio_clock.h',
363 'filters/audio_file_reader.cc', 367 'filters/audio_file_reader.cc',
364 'filters/audio_file_reader.h', 368 'filters/audio_file_reader.h',
365 'filters/audio_renderer_algorithm.cc', 369 'filters/audio_renderer_algorithm.cc',
366 'filters/audio_renderer_algorithm.h', 370 'filters/audio_renderer_algorithm.h',
367 'filters/audio_renderer_impl.cc', 371 'filters/audio_renderer_impl.cc',
(...skipping 1233 matching lines...) Expand 10 before | Expand all | Expand 10 after
1601 'jni_gen_package': 'media', 1605 'jni_gen_package': 'media',
1602 }, 1606 },
1603 'includes': ['../build/jni_generator.gypi'], 1607 'includes': ['../build/jni_generator.gypi'],
1604 }, 1608 },
1605 { 1609 {
1606 'target_name': 'player_android', 1610 'target_name': 'player_android',
1607 'type': 'static_library', 1611 'type': 'static_library',
1608 'sources': [ 1612 'sources': [
1609 'base/android/audio_decoder_job.cc', 1613 'base/android/audio_decoder_job.cc',
1610 'base/android/audio_decoder_job.h', 1614 'base/android/audio_decoder_job.h',
1611 'base/android/cdm_factory_android.cc', 1615 'base/android/browser_cdm_factory_android.cc',
1612 'base/android/media_codec_bridge.cc', 1616 'base/android/media_codec_bridge.cc',
1613 'base/android/media_codec_bridge.h', 1617 'base/android/media_codec_bridge.h',
1614 'base/android/media_decoder_job.cc', 1618 'base/android/media_decoder_job.cc',
1615 'base/android/media_decoder_job.h', 1619 'base/android/media_decoder_job.h',
1616 'base/android/media_drm_bridge.cc', 1620 'base/android/media_drm_bridge.cc',
1617 'base/android/media_drm_bridge.h', 1621 'base/android/media_drm_bridge.h',
1618 'base/android/media_jni_registrar.cc', 1622 'base/android/media_jni_registrar.cc',
1619 'base/android/media_jni_registrar.h', 1623 'base/android/media_jni_registrar.h',
1620 'base/android/media_player_android.cc', 1624 'base/android/media_player_android.cc',
1621 'base/android/media_player_android.h', 1625 'base/android/media_player_android.h',
1622 'base/android/media_player_bridge.cc', 1626 'base/android/media_player_bridge.cc',
1623 'base/android/media_player_bridge.h', 1627 'base/android/media_player_bridge.h',
1624 'base/android/media_player_listener.cc', 1628 'base/android/media_player_listener.cc',
1625 'base/android/media_player_listener.h', 1629 'base/android/media_player_listener.h',
1626 'base/android/media_source_player.cc', 1630 'base/android/media_source_player.cc',
1627 'base/android/media_source_player.h', 1631 'base/android/media_source_player.h',
1628 'base/android/video_decoder_job.cc', 1632 'base/android/video_decoder_job.cc',
1629 'base/android/video_decoder_job.h', 1633 'base/android/video_decoder_job.h',
1630 'base/android/webaudio_media_codec_bridge.cc', 1634 'base/android/webaudio_media_codec_bridge.cc',
1631 'base/android/webaudio_media_codec_bridge.h', 1635 'base/android/webaudio_media_codec_bridge.h',
1632 'base/android/webaudio_media_codec_info.h', 1636 'base/android/webaudio_media_codec_info.h',
1633 'base/cdm_factory.h', 1637 'base/browser_cdm.cc',
1638 'base/browser_cdm.h',
1639 'base/browser_cdm_factory.h',
1634 ], 1640 ],
1635 'dependencies': [ 1641 'dependencies': [
1636 '../base/base.gyp:base', 1642 '../base/base.gyp:base',
1637 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h ', 1643 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h ',
1638 '../ui/gl/gl.gyp:gl', 1644 '../ui/gl/gl.gyp:gl',
1639 '../url/url.gyp:url_lib', 1645 '../url/url.gyp:url_lib',
1640 'media_android_jni_headers', 1646 'media_android_jni_headers',
1641 ], 1647 ],
1642 'include_dirs': [ 1648 'include_dirs': [
1643 # Needed by media_drm_bridge.cc. 1649 # Needed by media_drm_bridge.cc.
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
1721 ], 1727 ],
1722 }], 1728 }],
1723 ], 1729 ],
1724 }], 1730 }],
1725 ], 1731 ],
1726 }, 1732 },
1727 ], 1733 ],
1728 }], 1734 }],
1729 ], 1735 ],
1730 } 1736 }
OLDNEW
« no previous file with comments | « media/cdm/player_tracker_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698