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

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

Issue 2315663002: Make cricket::VideoFrame inherit webrtc::VideoFrame. (Closed)
Patch Set: Created 4 years, 3 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 (c) 2016 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 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': [ '../build/common.gypi', ], 10 'includes': [ '../build/common.gypi', ],
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 'base/turnutils.h', 54 'base/turnutils.h',
55 'base/videoadapter.cc', 55 'base/videoadapter.cc',
56 'base/videoadapter.h', 56 'base/videoadapter.h',
57 'base/videobroadcaster.cc', 57 'base/videobroadcaster.cc',
58 'base/videobroadcaster.h', 58 'base/videobroadcaster.h',
59 'base/videocapturer.cc', 59 'base/videocapturer.cc',
60 'base/videocapturer.h', 60 'base/videocapturer.h',
61 'base/videocapturerfactory.h', 61 'base/videocapturerfactory.h',
62 'base/videocommon.cc', 62 'base/videocommon.cc',
63 'base/videocommon.h', 63 'base/videocommon.h',
64 'base/videoframe.cc',
65 'base/videoframe.h', 64 'base/videoframe.h',
66 'base/videoframefactory.cc',
67 'base/videoframefactory.h',
68 'base/videosourcebase.cc', 65 'base/videosourcebase.cc',
69 'base/videosourcebase.h', 66 'base/videosourcebase.h',
70 'devices/videorendererfactory.h', 67 'devices/videorendererfactory.h',
71 'engine/nullwebrtcvideoengine.h', 68 'engine/nullwebrtcvideoengine.h',
72 'engine/payload_type_mapper.cc', 69 'engine/payload_type_mapper.cc',
73 'engine/payload_type_mapper.h', 70 'engine/payload_type_mapper.h',
74 'engine/simulcast.cc', 71 'engine/simulcast.cc',
75 'engine/simulcast.h', 72 'engine/simulcast.h',
76 'engine/webrtccommon.h', 73 'engine/webrtccommon.h',
77 'engine/webrtcmediaengine.cc', 74 'engine/webrtcmediaengine.cc',
78 'engine/webrtcmediaengine.h', 75 'engine/webrtcmediaengine.h',
79 'engine/webrtcmediaengine.cc', 76 'engine/webrtcmediaengine.cc',
80 'engine/webrtcvideocapturer.cc', 77 'engine/webrtcvideocapturer.cc',
81 'engine/webrtcvideocapturer.h', 78 'engine/webrtcvideocapturer.h',
82 'engine/webrtcvideocapturerfactory.h', 79 'engine/webrtcvideocapturerfactory.h',
83 'engine/webrtcvideocapturerfactory.cc', 80 'engine/webrtcvideocapturerfactory.cc',
84 'engine/webrtcvideodecoderfactory.h', 81 'engine/webrtcvideodecoderfactory.h',
85 'engine/webrtcvideoencoderfactory.h', 82 'engine/webrtcvideoencoderfactory.h',
86 'engine/webrtcvideoengine2.cc', 83 'engine/webrtcvideoengine2.cc',
87 'engine/webrtcvideoengine2.h', 84 'engine/webrtcvideoengine2.h',
88 'engine/webrtcvideoframe.cc',
89 'engine/webrtcvideoframe.h', 85 'engine/webrtcvideoframe.h',
90 'engine/webrtcvideoframefactory.cc',
91 'engine/webrtcvideoframefactory.h',
92 'engine/webrtcvoe.h', 86 'engine/webrtcvoe.h',
93 'engine/webrtcvoiceengine.cc', 87 'engine/webrtcvoiceengine.cc',
94 'engine/webrtcvoiceengine.h', 88 'engine/webrtcvoiceengine.h',
95 'sctp/sctpdataengine.cc', 89 'sctp/sctpdataengine.cc',
96 'sctp/sctpdataengine.h', 90 'sctp/sctpdataengine.h',
97 ], 91 ],
98 # TODO(kjellander): Make the code compile without disabling these flags. 92 # TODO(kjellander): Make the code compile without disabling these flags.
99 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307 93 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307
100 'cflags': [ 94 'cflags': [
101 '-Wno-deprecated-declarations', 95 '-Wno-deprecated-declarations',
(...skipping 30 matching lines...) Expand all
132 }], 126 }],
133 ['build_with_chromium==1', { 127 ['build_with_chromium==1', {
134 'dependencies': [ 128 'dependencies': [
135 '<(webrtc_root)/modules/modules.gyp:video_capture', 129 '<(webrtc_root)/modules/modules.gyp:video_capture',
136 ], 130 ],
137 }, { 131 }, {
138 'defines': [ 132 'defines': [
139 'HAVE_WEBRTC_VIDEO', 133 'HAVE_WEBRTC_VIDEO',
140 'HAVE_WEBRTC_VOICE', 134 'HAVE_WEBRTC_VOICE',
141 ], 135 ],
142 'direct_dependent_settings': { 136 'all_dependent_settings': {
143 'defines': [ 137 'defines': [
144 'HAVE_WEBRTC_VIDEO', 138 'HAVE_WEBRTC_VIDEO',
145 'HAVE_WEBRTC_VOICE', 139 'HAVE_WEBRTC_VOICE',
146 ], 140 ],
147 }, 141 },
148 'dependencies': [ 142 'dependencies': [
149 '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_im pl', 143 '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_im pl',
150 ], 144 ],
151 }], 145 }],
152 ['OS=="linux" and use_gtk==1', { 146 ['OS=="linux" and use_gtk==1', {
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 'base/rtpdataengine_unittest.cc', 261 'base/rtpdataengine_unittest.cc',
268 'base/rtpdump_unittest.cc', 262 'base/rtpdump_unittest.cc',
269 'base/rtputils_unittest.cc', 263 'base/rtputils_unittest.cc',
270 'base/streamparams_unittest.cc', 264 'base/streamparams_unittest.cc',
271 'base/turnutils_unittest.cc', 265 'base/turnutils_unittest.cc',
272 'base/videoadapter_unittest.cc', 266 'base/videoadapter_unittest.cc',
273 'base/videobroadcaster_unittest.cc', 267 'base/videobroadcaster_unittest.cc',
274 'base/videocapturer_unittest.cc', 268 'base/videocapturer_unittest.cc',
275 'base/videocommon_unittest.cc', 269 'base/videocommon_unittest.cc',
276 'base/videoengine_unittest.h', 270 'base/videoengine_unittest.h',
277 'base/videoframe_unittest.h',
278 'engine/nullwebrtcvideoengine_unittest.cc', 271 'engine/nullwebrtcvideoengine_unittest.cc',
279 'engine/payload_type_mapper_unittest.cc', 272 'engine/payload_type_mapper_unittest.cc',
280 'engine/simulcast_unittest.cc', 273 'engine/simulcast_unittest.cc',
281 'engine/webrtcmediaengine_unittest.cc', 274 'engine/webrtcmediaengine_unittest.cc',
282 'engine/webrtcvideocapturer_unittest.cc', 275 'engine/webrtcvideocapturer_unittest.cc',
283 'engine/webrtcvideoframe_unittest.cc',
284 'engine/webrtcvideoframefactory_unittest.cc',
285 'engine/webrtcvideoengine2_unittest.cc', 276 'engine/webrtcvideoengine2_unittest.cc',
286 'engine/webrtcvoiceengine_unittest.cc', 277 'engine/webrtcvoiceengine_unittest.cc',
287 'sctp/sctpdataengine_unittest.cc', 278 'sctp/sctpdataengine_unittest.cc',
288 ], 279 ],
289 # TODO(kjellander): Make the code compile without disabling these flag s. 280 # TODO(kjellander): Make the code compile without disabling these flag s.
290 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307 281 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307
291 'cflags': [ 282 'cflags': [
292 '-Wno-sign-compare', 283 '-Wno-sign-compare',
293 ], 284 ],
294 'cflags_cc!': [ 285 'cflags_cc!': [
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 'sources': [ 358 'sources': [
368 'rtc_media_unittests.isolate', 359 'rtc_media_unittests.isolate',
369 ], 360 ],
370 }, 361 },
371 ], 362 ],
372 }], 363 }],
373 ], # conditions 364 ], # conditions
374 }], # include_tests==1 365 }], # include_tests==1
375 ], # conditions 366 ], # conditions
376 } 367 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698