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

Side by Side Diff: talk/build/common.gypi

Issue 1187573004: iOS HW H264 support. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Unit tests Created 5 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
OLDNEW
1 # 1 #
2 # libjingle 2 # libjingle
3 # Copyright 2012 Google Inc. 3 # Copyright 2012 Google Inc.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions are met: 6 # modification, are permitted provided that the following conditions are met:
7 # 7 #
8 # 1. Redistributions of source code must retain the above copyright notice, 8 # 1. Redistributions of source code must retain the above copyright notice,
9 # this list of conditions and the following disclaimer. 9 # this list of conditions and the following disclaimer.
10 # 2. Redistributions in binary form must reproduce the above copyright notice, 10 # 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 'build_icu%': 1, 44 'build_icu%': 1,
45 'build_json%': 1, 45 'build_json%': 1,
46 'build_libsrtp%': 1, 46 'build_libsrtp%': 1,
47 'build_libyuv%': 1, 47 'build_libyuv%': 1,
48 'build_usrsctp%': 1, 48 'build_usrsctp%': 1,
49 # Make it possible to provide custom locations for some libraries. 49 # Make it possible to provide custom locations for some libraries.
50 'libyuv_dir%': '<(DEPTH)/third_party/libyuv', 50 'libyuv_dir%': '<(DEPTH)/third_party/libyuv',
51 51
52 # Disable this to skip building source requiring GTK. 52 # Disable this to skip building source requiring GTK.
53 'use_gtk%': 1, 53 'use_gtk%': 1,
54
55 # Enable this to use HW H.264 encoder/decoder on iOS/Mac peerconnections.
pbos-webrtc 2015/06/23 19:15:17 PeerConnections (or remove peerconnections).
tkchin_webrtc 2015/06/24 23:21:14 Done.
56 # Enabling this may break interop with Android clients that support H264.
57 'use_objc_h264%': 0,
54 }, 58 },
55 'target_defaults': { 59 'target_defaults': {
56 'include_dirs': [ 60 'include_dirs': [
57 '<(DEPTH)', 61 '<(DEPTH)',
58 '../..', 62 '../..',
59 '../../third_party', 63 '../../third_party',
60 '../../third_party/webrtc', 64 '../../third_party/webrtc',
61 '../../webrtc', 65 '../../webrtc',
62 ], 66 ],
63 'defines': [ 67 'defines': [
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 'IOS', 136 'IOS',
133 'WEBRTC_MAC', 137 'WEBRTC_MAC',
134 'WEBRTC_IOS', 138 'WEBRTC_IOS',
135 ], 139 ],
136 }], 140 }],
137 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', { 141 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
138 'defines': [ 142 'defines': [
139 'CARBON_DEPRECATED=YES', 143 'CARBON_DEPRECATED=YES',
140 ], 144 ],
141 }], 145 }],
146 ['OS=="ios" and (use_objc_h264==1)', {
147 'defines': [
148 'WEBRTC_OBJC_H264',
149 ],
150 }],
142 ['os_posix==1', { 151 ['os_posix==1', {
143 'configurations': { 152 'configurations': {
144 'Debug_Base': { 153 'Debug_Base': {
145 'defines': [ 154 'defines': [
146 # Chromium's build/common.gypi defines this for all posix _except_ 155 # Chromium's build/common.gypi defines this for all posix _except_
147 # for ios & mac. We want it there as well, e.g. because ASSERT 156 # for ios & mac. We want it there as well, e.g. because ASSERT
148 # and friends trigger off of it. 157 # and friends trigger off of it.
149 '_DEBUG', 158 '_DEBUG',
150 ], 159 ],
151 }, 160 },
152 }, 161 },
153 'defines': [ 162 'defines': [
154 'HASH_NAMESPACE=__gnu_cxx', 163 'HASH_NAMESPACE=__gnu_cxx',
155 'WEBRTC_POSIX', 164 'WEBRTC_POSIX',
156 'DISABLE_DYNAMIC_CAST', 165 'DISABLE_DYNAMIC_CAST',
157 # The POSIX standard says we have to define this. 166 # The POSIX standard says we have to define this.
158 '_REENTRANT', 167 '_REENTRANT',
159 ], 168 ],
160 }], 169 }],
161 ], 170 ],
162 }, # target_defaults 171 }, # target_defaults
163 } 172 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698