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: media/capture/capture.gyp

Issue 2169013002: Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build errors Created 4 years, 4 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 | « media/capture/BUILD.gn ('k') | media/capture/video/android/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2016 The Chromium Authors. All rights reserved. 1 # Copyright 2016 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'capture_sources': [ 8 'capture_sources': [
9 'capture_export.h', 9 'capture_export.h',
10 'content/animated_content_sampler.cc', 10 'content/animated_content_sampler.cc',
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 'video/mac/video_capture_device_avfoundation_mac.mm', 47 'video/mac/video_capture_device_avfoundation_mac.mm',
48 'video/mac/video_capture_device_decklink_mac.h', 48 'video/mac/video_capture_device_decklink_mac.h',
49 'video/mac/video_capture_device_decklink_mac.mm', 49 'video/mac/video_capture_device_decklink_mac.mm',
50 'video/mac/video_capture_device_factory_mac.h', 50 'video/mac/video_capture_device_factory_mac.h',
51 'video/mac/video_capture_device_factory_mac.mm', 51 'video/mac/video_capture_device_factory_mac.mm',
52 'video/mac/video_capture_device_mac.h', 52 'video/mac/video_capture_device_mac.h',
53 'video/mac/video_capture_device_mac.mm', 53 'video/mac/video_capture_device_mac.mm',
54 'video/scoped_result_callback.h', 54 'video/scoped_result_callback.h',
55 'video/video_capture_device.cc', 55 'video/video_capture_device.cc',
56 'video/video_capture_device.h', 56 'video/video_capture_device.h',
57 'video/video_capture_device_descriptor.cc',
58 'video/video_capture_device_descriptor.h',
57 'video/video_capture_device_factory.cc', 59 'video/video_capture_device_factory.cc',
58 'video/video_capture_device_factory.h', 60 'video/video_capture_device_factory.h',
59 'video/video_capture_device_info.cc',
60 'video/video_capture_device_info.h',
61 'video/win/capability_list_win.cc', 61 'video/win/capability_list_win.cc',
62 'video/win/capability_list_win.h', 62 'video/win/capability_list_win.h',
63 'video/win/filter_base_win.cc', 63 'video/win/filter_base_win.cc',
64 'video/win/filter_base_win.h', 64 'video/win/filter_base_win.h',
65 'video/win/pin_base_win.cc', 65 'video/win/pin_base_win.cc',
66 'video/win/pin_base_win.h', 66 'video/win/pin_base_win.h',
67 'video/win/sink_filter_observer_win.h', 67 'video/win/sink_filter_observer_win.h',
68 'video/win/sink_filter_win.cc', 68 'video/win/sink_filter_win.cc',
69 'video/win/sink_filter_win.h', 69 'video/win/sink_filter_win.h',
70 'video/win/sink_input_pin_win.cc', 70 'video/win/sink_input_pin_win.cc',
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 ], 236 ],
237 'variables': { 237 'variables': {
238 'java_in_dir': 'video/android/java', 238 'java_in_dir': 'video/android/java',
239 }, 239 },
240 'includes': ['../../build/java.gypi'], 240 'includes': ['../../build/java.gypi'],
241 }, 241 },
242 { 242 {
243 'target_name': 'media_android_captureapitype', 243 'target_name': 'media_android_captureapitype',
244 'type': 'none', 244 'type': 'none',
245 'variables': { 245 'variables': {
246 'source_file': 'video/video_capture_device.h', 246 'source_file': 'video/video_capture_device_descriptor.h',
247 }, 247 },
248 'includes': [ '../../build/android/java_cpp_enum.gypi' ], 248 'includes': [ '../../build/android/java_cpp_enum.gypi' ],
249 }, 249 },
250 { 250 {
251 'target_name': 'media_android_imageformat', 251 'target_name': 'media_android_imageformat',
252 'type': 'none', 252 'type': 'none',
253 'variables': { 253 'variables': {
254 'source_file': 'video/android/video_capture_device_android.h', 254 'source_file': 'video/android/video_capture_device_android.h',
255 }, 255 },
256 'includes': [ '../../build/android/java_cpp_enum.gypi' ], 256 'includes': [ '../../build/android/java_cpp_enum.gypi' ],
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 ], 299 ],
300 }, 300 },
301 ], 301 ],
302 }], 302 }],
303 ], 303 ],
304 304
305 }], 305 }],
306 306
307 ], 307 ],
308 } 308 }
OLDNEW
« no previous file with comments | « media/capture/BUILD.gn ('k') | media/capture/video/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698