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

Side by Side Diff: media/media_cdm.gypi

Issue 1734613003: Move libvpx_new to libvpx (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 9 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
« no previous file with comments | « media/media.gyp ('k') | remoting/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'includes': [ 6 'includes': [
7 'media_variables.gypi', 7 'media_variables.gypi',
8 ], 8 ],
9 'variables': { 9 'variables': {
10 # Set |use_fake_video_decoder| to 1 to ignore input frames in |clearkeycdm|, 10 # Set |use_fake_video_decoder| to 1 to ignore input frames in |clearkeycdm|,
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 }], 47 }],
48 ['media_use_ffmpeg == 1 and use_fake_video_decoder == 0' , { 48 ['media_use_ffmpeg == 1 and use_fake_video_decoder == 0' , {
49 'sources': [ 49 'sources': [
50 'cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc', 50 'cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc',
51 'cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h', 51 'cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h',
52 ], 52 ],
53 }], 53 }],
54 ['use_libvpx_in_clear_key_cdm == 1 and use_fake_video_decoder == 0' , { 54 ['use_libvpx_in_clear_key_cdm == 1 and use_fake_video_decoder == 0' , {
55 'defines': ['CLEAR_KEY_CDM_USE_LIBVPX_DECODER'], 55 'defines': ['CLEAR_KEY_CDM_USE_LIBVPX_DECODER'],
56 'dependencies': [ 56 'dependencies': [
57 '<(DEPTH)/third_party/libvpx_new/libvpx.gyp:libvpx_new', 57 '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
58 ], 58 ],
59 'sources': [ 59 'sources': [
60 'cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.cc', 60 'cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.cc',
61 'cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h', 61 'cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h',
62 ], 62 ],
63 }], 63 }],
64 ['os_posix == 1 and OS != "mac"', { 64 ['os_posix == 1 and OS != "mac"', {
65 'type': 'loadable_module', # Must be in PRODUCT_DIR for ASAN bot. 65 'type': 'loadable_module', # Must be in PRODUCT_DIR for ASAN bot.
66 }], 66 }],
67 ['OS == "mac" or OS == "win"', { 67 ['OS == "mac" or OS == "win"', {
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 # Built by clearkeycdm. 136 # Built by clearkeycdm.
137 '<(PRODUCT_DIR)/libclearkeycdm.so', 137 '<(PRODUCT_DIR)/libclearkeycdm.so',
138 ], 138 ],
139 }], 139 }],
140 ], 140 ],
141 }, 141 },
142 ], 142 ],
143 }], 143 }],
144 ], 144 ],
145 } 145 }
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | remoting/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698