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

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: Update after Pawel's review Created 6 years, 1 month 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 650 matching lines...) Expand 10 before | Expand all | Expand 10 after
661 'dependencies': [ 661 'dependencies': [
662 'media_java', 662 'media_java',
663 ], 663 ],
664 }], 664 }],
665 ], 665 ],
666 'defines': [ 666 'defines': [
667 'DISABLE_USER_INPUT_MONITOR', 667 'DISABLE_USER_INPUT_MONITOR',
668 ], 668 ],
669 }], 669 }],
670 # For VaapiVideoEncodeAccelerator. 670 # For VaapiVideoEncodeAccelerator.
671 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', { 671 ['target_arch != "arm" and chromeos == 1', {
672 'sources': [ 672 'sources': [
673 'filters/h264_bitstream_buffer.cc', 673 'filters/h264_bitstream_buffer.cc',
674 'filters/h264_bitstream_buffer.h', 674 'filters/h264_bitstream_buffer.h',
675 ], 675 ],
676 }], 676 }],
677 ['use_alsa==1', { 677 ['use_alsa==1', {
678 'link_settings': { 678 'link_settings': {
679 'libraries': [ 679 'libraries': [
680 '-lasound', 680 '-lasound',
681 ], 681 ],
(...skipping 1284 matching lines...) Expand 10 before | Expand all | Expand 10 after
1966 '../build/isolate.gypi', 1966 '../build/isolate.gypi',
1967 ], 1967 ],
1968 'sources': [ 1968 'sources': [
1969 'media_unittests.isolate', 1969 'media_unittests.isolate',
1970 ], 1970 ],
1971 }, 1971 },
1972 ], 1972 ],
1973 }], 1973 }],
1974 ], 1974 ],
1975 } 1975 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698