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

Side by Side Diff: media/media.gyp

Issue 490233002: VaapiVideoAccelerator: make Vaapi accelerator work with ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't limit h264_bitstream_buffer_unittest to x11 Created 6 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
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 636 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 'dependencies': [ 647 'dependencies': [
648 'media_java', 648 'media_java',
649 ], 649 ],
650 }], 650 }],
651 ], 651 ],
652 'defines': [ 652 'defines': [
653 'DISABLE_USER_INPUT_MONITOR', 653 'DISABLE_USER_INPUT_MONITOR',
654 ], 654 ],
655 }], 655 }],
656 # For VaapiVideoEncodeAccelerator. 656 # For VaapiVideoEncodeAccelerator.
657 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', { 657 ['target_arch != "arm" and chromeos == 1', {
658 'sources': [ 658 'sources': [
659 'filters/h264_bitstream_buffer.cc', 659 'filters/h264_bitstream_buffer.cc',
660 'filters/h264_bitstream_buffer.h', 660 'filters/h264_bitstream_buffer.h',
661 ], 661 ],
662 }], 662 }],
663 ['use_alsa==1', { 663 ['use_alsa==1', {
664 'link_settings': { 664 'link_settings': {
665 'libraries': [ 665 'libraries': [
666 '-lasound', 666 '-lasound',
667 ], 667 ],
(...skipping 1114 matching lines...) Expand 10 before | Expand all | Expand 10 after
1782 ], 1782 ],
1783 }], 1783 }],
1784 ], 1784 ],
1785 }], 1785 }],
1786 ], 1786 ],
1787 }, 1787 },
1788 ], 1788 ],
1789 }], 1789 }],
1790 ], 1790 ],
1791 } 1791 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698