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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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 side-by-side diff with in-line comments
Download patch
« talk/app/webrtc/objc/h264encoderfactory.cc ('K') | « talk/app/webrtc/objc/h264encoderfactory.cc ('k') | talk/examples/objc/AppRTCDemo/ARDAppClient.m » ('j') | webrtc/modules/video_coding/codecs/h264/h264.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/build/common.gypi
diff --git a/talk/build/common.gypi b/talk/build/common.gypi
index 36a96c5c5585de327b4f80d2382116f19bcc65e1..b828024be325306c8f27f8ddb17512c42954a03d 100644
--- a/talk/build/common.gypi
+++ b/talk/build/common.gypi
@@ -51,6 +51,10 @@
# Disable this to skip building source requiring GTK.
'use_gtk%': 1,
+
+ # 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.
+ # Enabling this may break interop with Android clients that support H264.
+ 'use_objc_h264%': 0,
},
'target_defaults': {
'include_dirs': [
@@ -139,6 +143,11 @@
'CARBON_DEPRECATED=YES',
],
}],
+ ['OS=="ios" and (use_objc_h264==1)', {
+ 'defines': [
+ 'WEBRTC_OBJC_H264',
+ ],
+ }],
['os_posix==1', {
'configurations': {
'Debug_Base': {
« talk/app/webrtc/objc/h264encoderfactory.cc ('K') | « talk/app/webrtc/objc/h264encoderfactory.cc ('k') | talk/examples/objc/AppRTCDemo/ARDAppClient.m » ('j') | webrtc/modules/video_coding/codecs/h264/h264.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698