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

Side by Side Diff: webkit/media/webkit_media.gypi

Issue 11316045: Add a libvpx video decoder to ClearKeyCdm and move the fake video decoder to its own class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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
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 'conditions': [ 7 'conditions': [
8 ['OS == "android" or OS == "ios"', { 8 ['OS == "android" or OS == "ios"', {
9 # Android and iOS don't use ffmpeg. 9 # Android and iOS don't use ffmpeg.
10 'use_ffmpeg%': 0, 10 'use_ffmpeg%': 0,
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 ], 110 ],
111 }, 111 },
112 { 112 {
113 'target_name': 'clearkeycdm', 113 'target_name': 'clearkeycdm',
114 'type': 'none', 114 'type': 'none',
115 'conditions': [ 115 'conditions': [
116 ['use_ffmpeg == 1' , { 116 ['use_ffmpeg == 1' , {
117 'defines': ['CLEAR_KEY_CDM_USE_FFMPEG_DECODER'], 117 'defines': ['CLEAR_KEY_CDM_USE_FFMPEG_DECODER'],
118 'dependencies': [ 118 'dependencies': [
119 '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 119 '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
120 # TODO(tomfinegan): This does not belong in the |use_ffmpeg| block.
121 '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
120 ], 122 ],
121 'sources': [ 123 'sources': [
122 'crypto/ppapi/ffmpeg_cdm_audio_decoder.cc', 124 'crypto/ppapi/ffmpeg_cdm_audio_decoder.cc',
123 'crypto/ppapi/ffmpeg_cdm_audio_decoder.h', 125 'crypto/ppapi/ffmpeg_cdm_audio_decoder.h',
124 'crypto/ppapi/ffmpeg_cdm_video_decoder.cc', 126 'crypto/ppapi/ffmpeg_cdm_video_decoder.cc',
125 'crypto/ppapi/ffmpeg_cdm_video_decoder.h', 127 'crypto/ppapi/ffmpeg_cdm_video_decoder.h',
126 ], 128 ],
127 }], 129 }],
128 ['os_posix == 1 and OS != "mac"', { 130 ['os_posix == 1 and OS != "mac"', {
129 'type': 'loadable_module', # Must be in PRODUCT_DIR for ASAN bots. 131 'type': 'loadable_module', # Must be in PRODUCT_DIR for ASAN bots.
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 # Not to strip important symbols by -Wl,-dead_strip. 178 # Not to strip important symbols by -Wl,-dead_strip.
177 '-Wl,-exported_symbol,_PPP_GetInterface', 179 '-Wl,-exported_symbol,_PPP_GetInterface',
178 '-Wl,-exported_symbol,_PPP_InitializeModule', 180 '-Wl,-exported_symbol,_PPP_InitializeModule',
179 '-Wl,-exported_symbol,_PPP_ShutdownModule' 181 '-Wl,-exported_symbol,_PPP_ShutdownModule'
180 ]}, 182 ]},
181 }], 183 }],
182 ], 184 ],
183 } 185 }
184 ], 186 ],
185 } 187 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698