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

Side by Side Diff: media/media.gyp

Issue 24079003: Add VideoCaptureDevice::GetDeviceSupportedFormats to interface + implementation for Linux and Fake (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed inexistent video_capture_device_dummy; also removed from media.gyp targets. Created 7 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 'audio/pulse/pulse_input.cc', 705 'audio/pulse/pulse_input.cc',
706 'audio/pulse/pulse_input.h', 706 'audio/pulse/pulse_input.h',
707 'audio/pulse/pulse_output.cc', 707 'audio/pulse/pulse_output.cc',
708 'audio/pulse/pulse_output.h', 708 'audio/pulse/pulse_output.h',
709 'audio/pulse/pulse_unified.cc', 709 'audio/pulse/pulse_unified.cc',
710 'audio/pulse/pulse_unified.h', 710 'audio/pulse/pulse_unified.h',
711 'audio/pulse/pulse_util.cc', 711 'audio/pulse/pulse_util.cc',
712 'audio/pulse/pulse_util.h', 712 'audio/pulse/pulse_util.h',
713 ], 713 ],
714 }], 714 }],
715 ['os_posix==1', {
716 'sources!': [
717 'video/capture/video_capture_device_dummy.cc',
718 'video/capture/video_capture_device_dummy.h',
719 ],
720 }],
721 ['OS=="mac"', { 715 ['OS=="mac"', {
722 'link_settings': { 716 'link_settings': {
723 'libraries': [ 717 'libraries': [
724 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework', 718 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
725 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework', 719 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
726 '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework', 720 '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework',
727 '$(SDKROOT)/System/Library/Frameworks/CoreMIDI.framework', 721 '$(SDKROOT)/System/Library/Frameworks/CoreMIDI.framework',
728 '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework', 722 '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework',
729 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', 723 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
730 '$(SDKROOT)/System/Library/Frameworks/QTKit.framework', 724 '$(SDKROOT)/System/Library/Frameworks/QTKit.framework',
731 ], 725 ],
732 }, 726 },
733 }], 727 }],
734 ['OS=="win"', { 728 ['OS=="win"', {
735 'sources!': [
736 'video/capture/video_capture_device_dummy.cc',
737 'video/capture/video_capture_device_dummy.h',
738 ],
739 'link_settings': { 729 'link_settings': {
740 'libraries': [ 730 'libraries': [
741 '-lmf.lib', 731 '-lmf.lib',
742 '-lmfplat.lib', 732 '-lmfplat.lib',
743 '-lmfreadwrite.lib', 733 '-lmfreadwrite.lib',
744 '-lmfuuid.lib', 734 '-lmfuuid.lib',
745 ], 735 ],
746 }, 736 },
747 # Specify delayload for media.dll. 737 # Specify delayload for media.dll.
748 'msvs_settings': { 738 'msvs_settings': {
(...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after
1537 ], 1527 ],
1538 }], 1528 }],
1539 ], 1529 ],
1540 }], 1530 }],
1541 ], 1531 ],
1542 }, 1532 },
1543 ], 1533 ],
1544 }], 1534 }],
1545 ], 1535 ],
1546 } 1536 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698