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

Side by Side Diff: media/media.gyp

Issue 23702008: Adds the UserInputMonitor implementation for Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 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
« no previous file with comments | « media/base/user_input_monitor_win.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) 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 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 'dependencies': [ 541 'dependencies': [
542 '../third_party/libvpx/libvpx.gyp:libvpx', 542 '../third_party/libvpx/libvpx.gyp:libvpx',
543 '../third_party/libyuv/libyuv.gyp:libyuv', 543 '../third_party/libyuv/libyuv.gyp:libyuv',
544 ], 544 ],
545 'sources': [ 545 'sources': [
546 'webm/chromeos/ebml_writer.cc', 546 'webm/chromeos/ebml_writer.cc',
547 'webm/chromeos/ebml_writer.h', 547 'webm/chromeos/ebml_writer.h',
548 'webm/chromeos/webm_encoder.cc', 548 'webm/chromeos/webm_encoder.cc',
549 'webm/chromeos/webm_encoder.h', 549 'webm/chromeos/webm_encoder.h',
550 ], 550 ],
551 'defines': [
552 # TODO(jiayl): figure out why MediaStreamInfoBarTest.
553 # DenyingCameraDoesNotCauseStickyDenyForMics fails on ChromeOS and
554 # remove this.
555 'DISABLE_USER_INPUT_MONITOR',
556 ],
557 'sources!': [
558 'base/user_input_monitor_linux.cc',
559 ],
560 }], 551 }],
561 ['use_alsa==1', { 552 ['use_alsa==1', {
562 'link_settings': { 553 'link_settings': {
563 'libraries': [ 554 'libraries': [
564 '-lasound', 555 '-lasound',
565 ], 556 ],
566 }, 557 },
567 }, { # use_alsa==0 558 }, { # use_alsa==0
568 'sources/': [ ['exclude', '/alsa_'], 559 'sources/': [ ['exclude', '/alsa_'],
569 ['exclude', '/audio_manager_linux'] ], 560 ['exclude', '/audio_manager_linux'] ],
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
628 ], 619 ],
629 }], 620 }],
630 ['OS!="linux"', { 621 ['OS!="linux"', {
631 'sources!': [ 622 'sources!': [
632 'audio/cras/audio_manager_cras.cc', 623 'audio/cras/audio_manager_cras.cc',
633 'audio/cras/audio_manager_cras.h', 624 'audio/cras/audio_manager_cras.h',
634 'audio/cras/cras_input.cc', 625 'audio/cras/cras_input.cc',
635 'audio/cras/cras_input.h', 626 'audio/cras/cras_input.h',
636 'audio/cras/cras_unified.cc', 627 'audio/cras/cras_unified.cc',
637 'audio/cras/cras_unified.h', 628 'audio/cras/cras_unified.h',
638 'base/keyboard_event_counter.cc',
639 'base/keyboard_event_counter.h',
640 ], 629 ],
641 }], 630 }],
642 ['use_pulseaudio==1', { 631 ['use_pulseaudio==1', {
643 'cflags': [ 632 'cflags': [
644 '<!@(pkg-config --cflags libpulse)', 633 '<!@(pkg-config --cflags libpulse)',
645 ], 634 ],
646 'defines': [ 635 'defines': [
647 'USE_PULSEAUDIO', 636 'USE_PULSEAUDIO',
648 ], 637 ],
649 'conditions': [ 638 'conditions': [
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 ], 812 ],
824 'sources': [ 813 'sources': [
825 'base/simd/convert_yuv_to_rgb_x86.cc', 814 'base/simd/convert_yuv_to_rgb_x86.cc',
826 ], 815 ],
827 }], 816 }],
828 ['google_tv==1', { 817 ['google_tv==1', {
829 'defines': [ 818 'defines': [
830 'ENABLE_EAC3_PLAYBACK', 819 'ENABLE_EAC3_PLAYBACK',
831 ], 820 ],
832 }], 821 }],
822 ['OS!="linux" and OS!="win"', {
823 'sources!': [
824 'base/keyboard_event_counter.cc',
825 'base/keyboard_event_counter.h',
826 ],
827 }],
833 ], 828 ],
834 }, 829 },
835 { 830 {
836 'target_name': 'media_unittests', 831 'target_name': 'media_unittests',
837 'type': '<(gtest_target_type)', 832 'type': '<(gtest_target_type)',
838 'dependencies': [ 833 'dependencies': [
839 'media', 834 'media',
840 'media_test_support', 835 'media_test_support',
841 'shared_memory_support', 836 'shared_memory_support',
842 '../base/base.gyp:base', 837 '../base/base.gyp:base',
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
905 'base/multi_channel_resampler_unittest.cc', 900 'base/multi_channel_resampler_unittest.cc',
906 'base/pipeline_unittest.cc', 901 'base/pipeline_unittest.cc',
907 'base/ranges_unittest.cc', 902 'base/ranges_unittest.cc',
908 'base/run_all_unittests.cc', 903 'base/run_all_unittests.cc',
909 'base/scoped_histogram_timer_unittest.cc', 904 'base/scoped_histogram_timer_unittest.cc',
910 'base/serial_runner_unittest.cc', 905 'base/serial_runner_unittest.cc',
911 'base/seekable_buffer_unittest.cc', 906 'base/seekable_buffer_unittest.cc',
912 'base/sinc_resampler_unittest.cc', 907 'base/sinc_resampler_unittest.cc',
913 'base/test_data_util.cc', 908 'base/test_data_util.cc',
914 'base/test_data_util.h', 909 'base/test_data_util.h',
910 'base/user_input_monitor_unittest.cc',
915 'base/vector_math_testing.h', 911 'base/vector_math_testing.h',
916 'base/vector_math_unittest.cc', 912 'base/vector_math_unittest.cc',
917 'base/video_frame_unittest.cc', 913 'base/video_frame_unittest.cc',
918 'base/video_util_unittest.cc', 914 'base/video_util_unittest.cc',
919 'base/yuv_convert_unittest.cc', 915 'base/yuv_convert_unittest.cc',
920 'cdm/aes_decryptor_unittest.cc', 916 'cdm/aes_decryptor_unittest.cc',
921 'ffmpeg/ffmpeg_common_unittest.cc', 917 'ffmpeg/ffmpeg_common_unittest.cc',
922 'filters/audio_decoder_selector_unittest.cc', 918 'filters/audio_decoder_selector_unittest.cc',
923 'filters/audio_file_reader_unittest.cc', 919 'filters/audio_file_reader_unittest.cc',
924 'filters/audio_renderer_algorithm_unittest.cc', 920 'filters/audio_renderer_algorithm_unittest.cc',
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
1509 ], 1505 ],
1510 }], 1506 }],
1511 ], 1507 ],
1512 }], 1508 }],
1513 ], 1509 ],
1514 }, 1510 },
1515 ], 1511 ],
1516 }], 1512 }],
1517 ], 1513 ],
1518 } 1514 }
OLDNEW
« no previous file with comments | « media/base/user_input_monitor_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698