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

Side by Side Diff: media/media.gyp

Issue 8177008: Adding VideoCaptureDevice for Mac. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Changes based on review by dmac. Created 9 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
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 # Override to dynamically link the PulseAudio library. 8 # Override to dynamically link the PulseAudio library.
9 'use_pulseaudio%': 0, 9 'use_pulseaudio%': 0,
10 }, 10 },
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 'filters/null_audio_renderer.cc', 197 'filters/null_audio_renderer.cc',
198 'filters/null_audio_renderer.h', 198 'filters/null_audio_renderer.h',
199 'filters/null_video_renderer.cc', 199 'filters/null_video_renderer.cc',
200 'filters/null_video_renderer.h', 200 'filters/null_video_renderer.h',
201 'filters/video_renderer_base.cc', 201 'filters/video_renderer_base.cc',
202 'filters/video_renderer_base.h', 202 'filters/video_renderer_base.h',
203 'video/capture/fake_video_capture_device.cc', 203 'video/capture/fake_video_capture_device.cc',
204 'video/capture/fake_video_capture_device.h', 204 'video/capture/fake_video_capture_device.h',
205 'video/capture/linux/video_capture_device_linux.cc', 205 'video/capture/linux/video_capture_device_linux.cc',
206 'video/capture/linux/video_capture_device_linux.h', 206 'video/capture/linux/video_capture_device_linux.h',
207 'video/capture/mac/video_capture_device_mac.h',
208 'video/capture/mac/video_capture_device_mac.mm',
209 'video/capture/mac/video_capture_device_mac_qtkit.h',
210 'video/capture/mac/video_capture_device_mac_qtkit.mm',
207 'video/capture/video_capture.h', 211 'video/capture/video_capture.h',
208 'video/capture/video_capture_device.h', 212 'video/capture/video_capture_device.h',
209 'video/capture/video_capture_device_dummy.cc', 213 'video/capture/video_capture_device_dummy.cc',
210 'video/capture/video_capture_device_dummy.h', 214 'video/capture/video_capture_device_dummy.h',
211 'video/capture/video_capture_proxy.cc', 215 'video/capture/video_capture_proxy.cc',
212 'video/capture/video_capture_proxy.h', 216 'video/capture/video_capture_proxy.h',
213 'video/capture/video_capture_types.h', 217 'video/capture/video_capture_types.h',
214 'video/capture/win/filter_base_win.cc', 218 'video/capture/win/filter_base_win.cc',
215 'video/capture/win/filter_base_win.h', 219 'video/capture/win/filter_base_win.h',
216 'video/capture/win/pin_base_win.cc', 220 'video/capture/win/pin_base_win.cc',
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 'libraries': [ 324 'libraries': [
321 ], 325 ],
322 }, 326 },
323 }], 327 }],
324 ['OS!="openbsd"', { 328 ['OS!="openbsd"', {
325 'sources!': [ 329 'sources!': [
326 'audio/openbsd/audio_manager_openbsd.cc', 330 'audio/openbsd/audio_manager_openbsd.cc',
327 'audio/openbsd/audio_manager_openbsd.h', 331 'audio/openbsd/audio_manager_openbsd.h',
328 ], 332 ],
329 }], 333 }],
330 ['os_posix == 1 and OS != "mac"', { 334 ['os_posix == 1', {
331 'sources!': [ 335 'sources!': [
332 'video/capture/video_capture_device_dummy.cc', 336 'video/capture/video_capture_device_dummy.cc',
333 'video/capture/video_capture_device_dummy.h', 337 'video/capture/video_capture_device_dummy.h',
334 ], 338 ],
335 }], 339 }],
336 ['OS=="mac"', { 340 ['OS=="mac"', {
337 'link_settings': { 341 'link_settings': {
338 'libraries': [ 342 'libraries': [
339 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework', 343 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
340 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework', 344 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
341 '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework', 345 '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework',
346 '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework',
347 '$(SDKROOT)/System/Library/Frameworks/QTKit.framework',
342 ], 348 ],
343 }, 349 },
344 }], 350 }],
345 ['OS=="win"', { 351 ['OS=="win"', {
346 'sources!': [ 352 'sources!': [
347 'video/capture/video_capture_device_dummy.cc', 353 'video/capture/video_capture_device_dummy.cc',
348 'video/capture/video_capture_device_dummy.h', 354 'video/capture/video_capture_device_dummy.h',
349 ], 355 ],
350 }], 356 }],
351 ], 357 ],
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
917 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 923 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
918 ], 924 ],
919 'sources': [ 925 'sources': [
920 'tools/media_bench/media_bench.cc', 926 'tools/media_bench/media_bench.cc',
921 ], 927 ],
922 }, 928 },
923 ], 929 ],
924 }] 930 }]
925 ], 931 ],
926 } 932 }
OLDNEW
« no previous file with comments | « no previous file | media/video/capture/mac/video_capture_device_mac.h » ('j') | media/video/capture/mac/video_capture_device_mac.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698