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

Side by Side Diff: media/media.gyp

Issue 774423002: Provides method for setting a BrowserCdmFactory for IPC-based CDM. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: include base/logging.h Created 6 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
« no previous file with comments | « media/base/browser_cdm_factory.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 642 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 # Exclude the sources that depend on libvpx. 653 # Exclude the sources that depend on libvpx.
654 'sources!': [ 654 'sources!': [
655 'filters/vpx_video_decoder.cc', 655 'filters/vpx_video_decoder.cc',
656 'filters/vpx_video_decoder.h', 656 'filters/vpx_video_decoder.h',
657 ], 657 ],
658 }], 658 }],
659 ['enable_browser_cdms==1', { 659 ['enable_browser_cdms==1', {
660 'sources': [ 660 'sources': [
661 'base/browser_cdm.cc', 661 'base/browser_cdm.cc',
662 'base/browser_cdm.h', 662 'base/browser_cdm.h',
663 'base/browser_cdm_factory.cc',
663 'base/browser_cdm_factory.h', 664 'base/browser_cdm_factory.h',
664 ], 665 ],
665 }], 666 }],
666 ['OS=="android"', { 667 ['OS=="android"', {
667 'dependencies': [ 668 'dependencies': [
668 'media_android_jni_headers', 669 'media_android_jni_headers',
669 'player_android', 670 'player_android',
670 'video_capture_android_jni_headers', 671 'video_capture_android_jni_headers',
671 ], 672 ],
672 'sources': [ 673 'sources': [
(...skipping 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after
1792 'includes': ['../build/jni_generator.gypi'], 1793 'includes': ['../build/jni_generator.gypi'],
1793 }, 1794 },
1794 { 1795 {
1795 # GN: //media/base/android:android 1796 # GN: //media/base/android:android
1796 'target_name': 'player_android', 1797 'target_name': 'player_android',
1797 'type': 'static_library', 1798 'type': 'static_library',
1798 'sources': [ 1799 'sources': [
1799 'base/android/audio_decoder_job.cc', 1800 'base/android/audio_decoder_job.cc',
1800 'base/android/audio_decoder_job.h', 1801 'base/android/audio_decoder_job.h',
1801 'base/android/browser_cdm_factory_android.cc', 1802 'base/android/browser_cdm_factory_android.cc',
1803 'base/android/browser_cdm_factory_android.h',
1802 'base/android/demuxer_android.h', 1804 'base/android/demuxer_android.h',
1803 'base/android/demuxer_stream_player_params.cc', 1805 'base/android/demuxer_stream_player_params.cc',
1804 'base/android/demuxer_stream_player_params.h', 1806 'base/android/demuxer_stream_player_params.h',
1805 'base/android/media_codec_bridge.cc', 1807 'base/android/media_codec_bridge.cc',
1806 'base/android/media_codec_bridge.h', 1808 'base/android/media_codec_bridge.h',
1807 'base/android/media_common_android.h', 1809 'base/android/media_common_android.h',
1808 'base/android/media_decoder_job.cc', 1810 'base/android/media_decoder_job.cc',
1809 'base/android/media_decoder_job.h', 1811 'base/android/media_decoder_job.h',
1810 'base/android/media_drm_bridge.cc', 1812 'base/android/media_drm_bridge.cc',
1811 'base/android/media_drm_bridge.h', 1813 'base/android/media_drm_bridge.h',
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
1999 '../build/isolate.gypi', 2001 '../build/isolate.gypi',
2000 ], 2002 ],
2001 'sources': [ 2003 'sources': [
2002 'media_unittests.isolate', 2004 'media_unittests.isolate',
2003 ], 2005 ],
2004 }, 2006 },
2005 ], 2007 ],
2006 }], 2008 }],
2007 ], 2009 ],
2008 } 2010 }
OLDNEW
« no previous file with comments | « media/base/browser_cdm_factory.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698