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

Side by Side Diff: webrtc/sdk/sdk.gyp

Issue 2046863004: Add AVFoundation video capture support to Mac objc SDK (based on iOS) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Revert accidental patch that belonged in another place Created 4 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 # Copyright 2016 The WebRTC project authors. All Rights Reserved. 1 # Copyright 2016 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 { 9 {
10 'includes': [ 10 'includes': [
(...skipping 28 matching lines...) Expand all
39 'objc/Framework/Classes/RTCLogging.mm', 39 'objc/Framework/Classes/RTCLogging.mm',
40 'objc/Framework/Classes/RTCSSLAdapter.mm', 40 'objc/Framework/Classes/RTCSSLAdapter.mm',
41 'objc/Framework/Classes/RTCTracing.mm', 41 'objc/Framework/Classes/RTCTracing.mm',
42 'objc/Framework/Headers/WebRTC/RTCDispatcher.h', 42 'objc/Framework/Headers/WebRTC/RTCDispatcher.h',
43 'objc/Framework/Headers/WebRTC/RTCFieldTrials.h', 43 'objc/Framework/Headers/WebRTC/RTCFieldTrials.h',
44 'objc/Framework/Headers/WebRTC/RTCLogging.h', 44 'objc/Framework/Headers/WebRTC/RTCLogging.h',
45 'objc/Framework/Headers/WebRTC/RTCMacros.h', 45 'objc/Framework/Headers/WebRTC/RTCMacros.h',
46 'objc/Framework/Headers/WebRTC/RTCSSLAdapter.h', 46 'objc/Framework/Headers/WebRTC/RTCSSLAdapter.h',
47 'objc/Framework/Headers/WebRTC/RTCTracing.h', 47 'objc/Framework/Headers/WebRTC/RTCTracing.h',
48 ], 48 ],
49 'link_settings': {
tkchin_webrtc 2016/06/08 19:26:31 revert. AVFoundation is required by RTCCameraPrevi
50 'xcode_settings': {
51 'OTHER_LDFLAGS': [
52 '-framework AVFoundation',
53 ],
54 },
55 },
49 'conditions': [ 56 'conditions': [
50 ['OS=="ios"', { 57 ['OS=="ios"', {
51 'sources': [ 58 'sources': [
52 'objc/Framework/Classes/RTCCameraPreviewView.m', 59 'objc/Framework/Classes/RTCCameraPreviewView.m',
53 'objc/Framework/Classes/RTCUIApplication.h', 60 'objc/Framework/Classes/RTCUIApplication.h',
54 'objc/Framework/Classes/RTCUIApplication.mm', 61 'objc/Framework/Classes/RTCUIApplication.mm',
55 'objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h', 62 'objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h',
56 ], 63 ],
57 'link_settings': {
58 'xcode_settings': {
59 'OTHER_LDFLAGS': [
60 '-framework AVFoundation',
61 ],
62 },
63 },
64 }], # OS=="ios" 64 }], # OS=="ios"
65 ['build_with_chromium==0', { 65 ['build_with_chromium==0', {
66 'sources': [ 66 'sources': [
67 'objc/Framework/Classes/RTCFileLogger.mm', 67 'objc/Framework/Classes/RTCFileLogger.mm',
68 'objc/Framework/Headers/WebRTC/RTCFileLogger.h', 68 'objc/Framework/Headers/WebRTC/RTCFileLogger.h',
69 ], 69 ],
70 }], 70 }],
71 ], 71 ],
72 }, 72 },
73 { 73 {
74 'target_name': 'rtc_sdk_peerconnection_objc', 74 'target_name': 'rtc_sdk_peerconnection_objc',
75 'type': 'static_library', 75 'type': 'static_library',
76 'includes': [ '../build/objc_common.gypi' ], 76 'includes': [ '../build/objc_common.gypi' ],
77 'dependencies': [ 77 'dependencies': [
78 '<(webrtc_root)/api/api.gyp:libjingle_peerconnection', 78 '<(webrtc_root)/api/api.gyp:libjingle_peerconnection',
79 'rtc_sdk_common_objc', 79 'rtc_sdk_common_objc',
80 ], 80 ],
81 'include_dirs': [ 81 'include_dirs': [
82 'objc/Framework/Classes', 82 'objc/Framework/Classes',
83 'objc/Framework/Headers', 83 'objc/Framework/Headers',
84 ], 84 ],
85 'direct_dependent_settings': { 85 'direct_dependent_settings': {
86 'include_dirs': [ 86 'include_dirs': [
87 'objc/Framework/Classes', 87 'objc/Framework/Classes',
88 'objc/Framework/Headers', 88 'objc/Framework/Headers',
89 ], 89 ],
90 }, 90 },
91 'link_settings': { 91 'link_settings': {
tkchin_webrtc 2016/06/08 19:26:31 add the AVFoundation one here for now eventually i
92 'libraries': [ 92 'libraries': [
93 '-lstdc++', 93 '-lstdc++',
94 ], 94 ],
95 }, # link_settings 95 }, # link_settings
96 'sources': [ 96 'sources': [
97 'objc/Framework/Classes/RTCAudioTrack+Private.h', 97 'objc/Framework/Classes/RTCAudioTrack+Private.h',
98 'objc/Framework/Classes/RTCAudioTrack.mm', 98 'objc/Framework/Classes/RTCAudioTrack.mm',
99 'objc/Framework/Classes/RTCAVFoundationVideoSource+Private.h',
100 'objc/Framework/Classes/RTCAVFoundationVideoSource.mm',
99 'objc/Framework/Classes/RTCConfiguration+Private.h', 101 'objc/Framework/Classes/RTCConfiguration+Private.h',
100 'objc/Framework/Classes/RTCConfiguration.mm', 102 'objc/Framework/Classes/RTCConfiguration.mm',
101 'objc/Framework/Classes/RTCDataChannel+Private.h', 103 'objc/Framework/Classes/RTCDataChannel+Private.h',
102 'objc/Framework/Classes/RTCDataChannel.mm', 104 'objc/Framework/Classes/RTCDataChannel.mm',
103 'objc/Framework/Classes/RTCDataChannelConfiguration+Private.h', 105 'objc/Framework/Classes/RTCDataChannelConfiguration+Private.h',
104 'objc/Framework/Classes/RTCDataChannelConfiguration.mm', 106 'objc/Framework/Classes/RTCDataChannelConfiguration.mm',
105 'objc/Framework/Classes/RTCIceCandidate+Private.h', 107 'objc/Framework/Classes/RTCIceCandidate+Private.h',
106 'objc/Framework/Classes/RTCIceCandidate.mm', 108 'objc/Framework/Classes/RTCIceCandidate.mm',
107 'objc/Framework/Classes/RTCIceServer+Private.h', 109 'objc/Framework/Classes/RTCIceServer+Private.h',
108 'objc/Framework/Classes/RTCIceServer.mm', 110 'objc/Framework/Classes/RTCIceServer.mm',
(...skipping 27 matching lines...) Expand all
136 'objc/Framework/Classes/RTCStatsReport.mm', 138 'objc/Framework/Classes/RTCStatsReport.mm',
137 'objc/Framework/Classes/RTCVideoFrame+Private.h', 139 'objc/Framework/Classes/RTCVideoFrame+Private.h',
138 'objc/Framework/Classes/RTCVideoFrame.mm', 140 'objc/Framework/Classes/RTCVideoFrame.mm',
139 'objc/Framework/Classes/RTCVideoRendererAdapter+Private.h', 141 'objc/Framework/Classes/RTCVideoRendererAdapter+Private.h',
140 'objc/Framework/Classes/RTCVideoRendererAdapter.h', 142 'objc/Framework/Classes/RTCVideoRendererAdapter.h',
141 'objc/Framework/Classes/RTCVideoRendererAdapter.mm', 143 'objc/Framework/Classes/RTCVideoRendererAdapter.mm',
142 'objc/Framework/Classes/RTCVideoSource+Private.h', 144 'objc/Framework/Classes/RTCVideoSource+Private.h',
143 'objc/Framework/Classes/RTCVideoSource.mm', 145 'objc/Framework/Classes/RTCVideoSource.mm',
144 'objc/Framework/Classes/RTCVideoTrack+Private.h', 146 'objc/Framework/Classes/RTCVideoTrack+Private.h',
145 'objc/Framework/Classes/RTCVideoTrack.mm', 147 'objc/Framework/Classes/RTCVideoTrack.mm',
148 'objc/Framework/Classes/avfoundationvideocapturer.h',
149 'objc/Framework/Classes/avfoundationvideocapturer.mm',
146 'objc/Framework/Headers/WebRTC/RTCAudioTrack.h', 150 'objc/Framework/Headers/WebRTC/RTCAudioTrack.h',
151 'objc/Framework/Headers/WebRTC/RTCAVFoundationVideoSource.h',
147 'objc/Framework/Headers/WebRTC/RTCConfiguration.h', 152 'objc/Framework/Headers/WebRTC/RTCConfiguration.h',
148 'objc/Framework/Headers/WebRTC/RTCDataChannel.h', 153 'objc/Framework/Headers/WebRTC/RTCDataChannel.h',
149 'objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h', 154 'objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h',
150 'objc/Framework/Headers/WebRTC/RTCIceCandidate.h', 155 'objc/Framework/Headers/WebRTC/RTCIceCandidate.h',
151 'objc/Framework/Headers/WebRTC/RTCIceServer.h', 156 'objc/Framework/Headers/WebRTC/RTCIceServer.h',
152 'objc/Framework/Headers/WebRTC/RTCMediaConstraints.h', 157 'objc/Framework/Headers/WebRTC/RTCMediaConstraints.h',
153 'objc/Framework/Headers/WebRTC/RTCMediaStream.h', 158 'objc/Framework/Headers/WebRTC/RTCMediaStream.h',
154 'objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h', 159 'objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h',
155 'objc/Framework/Headers/WebRTC/RTCPeerConnection.h', 160 'objc/Framework/Headers/WebRTC/RTCPeerConnection.h',
156 'objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h', 161 'objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h',
157 'objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h', 162 'objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h',
158 'objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h', 163 'objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h',
159 'objc/Framework/Headers/WebRTC/RTCRtpParameters.h', 164 'objc/Framework/Headers/WebRTC/RTCRtpParameters.h',
160 'objc/Framework/Headers/WebRTC/RTCRtpReceiver.h', 165 'objc/Framework/Headers/WebRTC/RTCRtpReceiver.h',
161 'objc/Framework/Headers/WebRTC/RTCRtpSender.h', 166 'objc/Framework/Headers/WebRTC/RTCRtpSender.h',
162 'objc/Framework/Headers/WebRTC/RTCSessionDescription.h', 167 'objc/Framework/Headers/WebRTC/RTCSessionDescription.h',
163 'objc/Framework/Headers/WebRTC/RTCStatsReport.h', 168 'objc/Framework/Headers/WebRTC/RTCStatsReport.h',
164 'objc/Framework/Headers/WebRTC/RTCVideoFrame.h', 169 'objc/Framework/Headers/WebRTC/RTCVideoFrame.h',
165 'objc/Framework/Headers/WebRTC/RTCVideoRenderer.h', 170 'objc/Framework/Headers/WebRTC/RTCVideoRenderer.h',
166 'objc/Framework/Headers/WebRTC/RTCVideoSource.h', 171 'objc/Framework/Headers/WebRTC/RTCVideoSource.h',
167 'objc/Framework/Headers/WebRTC/RTCVideoTrack.h', 172 'objc/Framework/Headers/WebRTC/RTCVideoTrack.h',
168 ], # sources 173 ], # sources
169 'conditions': [ 174 'conditions': [
170 ['OS=="ios"', { 175 ['OS=="ios"', {
171 'sources': [ 176 'sources': [
172 'objc/Framework/Classes/RTCAVFoundationVideoSource+Private.h',
173 'objc/Framework/Classes/RTCAVFoundationVideoSource.mm',
174 'objc/Framework/Classes/RTCEAGLVideoView.m', 177 'objc/Framework/Classes/RTCEAGLVideoView.m',
175 'objc/Framework/Classes/avfoundationvideocapturer.h',
176 'objc/Framework/Classes/avfoundationvideocapturer.mm',
177 'objc/Framework/Headers/WebRTC/RTCAVFoundationVideoSource.h',
178 'objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h', 178 'objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h',
179 ], 179 ],
180 'link_settings': { 180 'link_settings': {
181 'xcode_settings': { 181 'xcode_settings': {
182 'OTHER_LDFLAGS': [ 182 'OTHER_LDFLAGS': [
183 '-framework CoreGraphics', 183 '-framework CoreGraphics',
184 '-framework GLKit', 184 '-framework GLKit',
185 '-framework OpenGLES', 185 '-framework OpenGLES',
186 '-framework QuartzCore', 186 '-framework QuartzCore',
187 ], 187 ],
188 }, 188 },
189 }, # link_settings 189 }, # link_settings
190 }], # OS=="ios" 190 }], # OS=="ios"
191 ['OS=="mac"', { 191 ['OS=="mac"', {
192 'sources': [ 192 'sources': [
193 'objc/Framework/Classes/RTCNSGLVideoView.m', 193 'objc/Framework/Classes/RTCNSGLVideoView.m',
194 'objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h', 194 'objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h',
195 ], 195 ],
196 'link_settings': { 196 'link_settings': {
197 'xcode_settings': { 197 'xcode_settings': {
198 'OTHER_LDFLAGS': [ 198 'OTHER_LDFLAGS': [
199 '-framework OpenGL', 199 '-framework OpenGL',
200 '-framework CoreMedia',
tkchin_webrtc 2016/06/08 19:26:31 ooc what compiler warning do you get without CoreM
200 ], 201 ],
201 }, 202 },
202 }, 203 },
203 }], 204 }],
204 ], # conditions 205 ], # conditions
205 }, # rtc_sdk_peerconnection_objc 206 }, # rtc_sdk_peerconnection_objc
206 { 207 {
207 'target_name': 'rtc_sdk_framework_objc', 208 'target_name': 'rtc_sdk_framework_objc',
208 'type': 'shared_library', 209 'type': 'shared_library',
209 'product_name': 'WebRTC', 210 'product_name': 'WebRTC',
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 'mac_framework_headers!': [ 300 'mac_framework_headers!': [
300 'objc/Framework/Headers/WebRTC/RTCFileLogger.h', 301 'objc/Framework/Headers/WebRTC/RTCFileLogger.h',
301 ], 302 ],
302 }], 303 }],
303 ], # conditions 304 ], # conditions
304 }, # rtc_sdk_framework_objc 305 }, # rtc_sdk_framework_objc
305 ], # targets 306 ], # targets
306 }], # OS=="ios" or (OS=="mac" and mac_deployment_target=="10.7") 307 }], # OS=="ios" or (OS=="mac" and mac_deployment_target=="10.7")
307 ], 308 ],
308 } 309 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698