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

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

Issue 2370993003: Reland of Delete VideoFrameFactory, CapturedFrame, and related code. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Resolve conflict in webrtc/media/BUILD.gn. Created 4 years, 2 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 | « webrtc/media/engine/webrtcvideoframefactory_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 'base/videoadapter.h', 57 'base/videoadapter.h',
58 'base/videobroadcaster.cc', 58 'base/videobroadcaster.cc',
59 'base/videobroadcaster.h', 59 'base/videobroadcaster.h',
60 'base/videocapturer.cc', 60 'base/videocapturer.cc',
61 'base/videocapturer.h', 61 'base/videocapturer.h',
62 'base/videocapturerfactory.h', 62 'base/videocapturerfactory.h',
63 'base/videocommon.cc', 63 'base/videocommon.cc',
64 'base/videocommon.h', 64 'base/videocommon.h',
65 'base/videoframe.cc', 65 'base/videoframe.cc',
66 'base/videoframe.h', 66 'base/videoframe.h',
67 'base/videoframefactory.cc',
68 'base/videoframefactory.h',
69 'base/videosourcebase.cc', 67 'base/videosourcebase.cc',
70 'base/videosourcebase.h', 68 'base/videosourcebase.h',
71 'devices/videorendererfactory.h', 69 'devices/videorendererfactory.h',
72 'engine/nullwebrtcvideoengine.h', 70 'engine/nullwebrtcvideoengine.h',
73 'engine/payload_type_mapper.cc', 71 'engine/payload_type_mapper.cc',
74 'engine/payload_type_mapper.h', 72 'engine/payload_type_mapper.h',
75 'engine/simulcast.cc', 73 'engine/simulcast.cc',
76 'engine/simulcast.h', 74 'engine/simulcast.h',
77 'engine/webrtccommon.h', 75 'engine/webrtccommon.h',
78 'engine/webrtcmediaengine.cc', 76 'engine/webrtcmediaengine.cc',
79 'engine/webrtcmediaengine.h', 77 'engine/webrtcmediaengine.h',
80 'engine/webrtcmediaengine.cc', 78 'engine/webrtcmediaengine.cc',
81 'engine/webrtcvideocapturer.cc', 79 'engine/webrtcvideocapturer.cc',
82 'engine/webrtcvideocapturer.h', 80 'engine/webrtcvideocapturer.h',
83 'engine/webrtcvideocapturerfactory.h', 81 'engine/webrtcvideocapturerfactory.h',
84 'engine/webrtcvideocapturerfactory.cc', 82 'engine/webrtcvideocapturerfactory.cc',
85 'engine/webrtcvideodecoderfactory.h', 83 'engine/webrtcvideodecoderfactory.h',
86 'engine/webrtcvideoencoderfactory.h', 84 'engine/webrtcvideoencoderfactory.h',
87 'engine/webrtcvideoengine2.cc', 85 'engine/webrtcvideoengine2.cc',
88 'engine/webrtcvideoengine2.h', 86 'engine/webrtcvideoengine2.h',
89 'engine/webrtcvideoframe.cc', 87 'engine/webrtcvideoframe.cc',
90 'engine/webrtcvideoframe.h', 88 'engine/webrtcvideoframe.h',
91 'engine/webrtcvideoframefactory.cc',
92 'engine/webrtcvideoframefactory.h',
93 'engine/webrtcvoe.h', 89 'engine/webrtcvoe.h',
94 'engine/webrtcvoiceengine.cc', 90 'engine/webrtcvoiceengine.cc',
95 'engine/webrtcvoiceengine.h', 91 'engine/webrtcvoiceengine.h',
96 'sctp/sctpdataengine.cc', 92 'sctp/sctpdataengine.cc',
97 'sctp/sctpdataengine.h', 93 'sctp/sctpdataengine.h',
98 ], 94 ],
99 # TODO(kjellander): Make the code compile without disabling these flags. 95 # TODO(kjellander): Make the code compile without disabling these flags.
100 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307 96 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307
101 'cflags': [ 97 'cflags': [
102 '-Wno-deprecated-declarations', 98 '-Wno-deprecated-declarations',
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 'gdi32.lib', 167 'gdi32.lib',
172 'strmiids.lib', 168 'strmiids.lib',
173 ], 169 ],
174 }, 170 },
175 }, 171 },
176 }], 172 }],
177 ], 173 ],
178 }, # target rtc_media 174 }, # target rtc_media
179 ], # targets. 175 ], # targets.
180 } 176 }
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvideoframefactory_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698