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

Side by Side Diff: trunk/src/media/media.gyp

Issue 350413002: Revert 279650 "Add VaapiVideoEncodeAccelerator for HW-accelerate..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
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 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 '../third_party/libvpx/libvpx.gyp:libvpx', 652 '../third_party/libvpx/libvpx.gyp:libvpx',
653 '../third_party/libyuv/libyuv.gyp:libyuv', 653 '../third_party/libyuv/libyuv.gyp:libyuv',
654 ], 654 ],
655 'sources': [ 655 'sources': [
656 'formats/webm/chromeos/ebml_writer.cc', 656 'formats/webm/chromeos/ebml_writer.cc',
657 'formats/webm/chromeos/ebml_writer.h', 657 'formats/webm/chromeos/ebml_writer.h',
658 'formats/webm/chromeos/webm_encoder.cc', 658 'formats/webm/chromeos/webm_encoder.cc',
659 'formats/webm/chromeos/webm_encoder.h', 659 'formats/webm/chromeos/webm_encoder.h',
660 ], 660 ],
661 }], 661 }],
662 # For VaapiVideoEncodeAccelerator.
663 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
664 'sources': [
665 'filters/h264_bitstream_buffer.cc',
666 'filters/h264_bitstream_buffer.h',
667 ],
668 }],
669 ['OS!="ios"', { 662 ['OS!="ios"', {
670 'dependencies': [ 663 'dependencies': [
671 '../third_party/libyuv/libyuv.gyp:libyuv', 664 '../third_party/libyuv/libyuv.gyp:libyuv',
672 ], 665 ],
673 }], 666 }],
674 ['use_alsa==1', { 667 ['use_alsa==1', {
675 'link_settings': { 668 'link_settings': {
676 'libraries': [ 669 'libraries': [
677 '-lasound', 670 '-lasound',
678 ], 671 ],
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after
1223 'sources': [ 1216 'sources': [
1224 'audio/cras/cras_input_unittest.cc', 1217 'audio/cras/cras_input_unittest.cc',
1225 'audio/cras/cras_unified_unittest.cc', 1218 'audio/cras/cras_unified_unittest.cc',
1226 ], 1219 ],
1227 'defines': [ 1220 'defines': [
1228 'USE_CRAS', 1221 'USE_CRAS',
1229 ], 1222 ],
1230 }], 1223 }],
1231 ], 1224 ],
1232 }], 1225 }],
1233 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
1234 'sources': [
1235 'filters/h264_bitstream_buffer_unittest.cc',
1236 ],
1237 }],
1238 ['use_alsa==0', { 1226 ['use_alsa==0', {
1239 'sources!': [ 1227 'sources!': [
1240 'audio/alsa/alsa_output_unittest.cc', 1228 'audio/alsa/alsa_output_unittest.cc',
1241 'audio/audio_low_latency_input_output_unittest.cc', 1229 'audio/audio_low_latency_input_output_unittest.cc',
1242 ], 1230 ],
1243 }], 1231 }],
1244 ['target_arch=="ia32" or target_arch=="x64"', { 1232 ['target_arch=="ia32" or target_arch=="x64"', {
1245 'sources': [ 1233 'sources': [
1246 'base/simd/convert_rgb_to_yuv_unittest.cc', 1234 'base/simd/convert_rgb_to_yuv_unittest.cc',
1247 ], 1235 ],
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
1750 ], 1738 ],
1751 }], 1739 }],
1752 ], 1740 ],
1753 }], 1741 }],
1754 ], 1742 ],
1755 }, 1743 },
1756 ], 1744 ],
1757 }], 1745 }],
1758 ], 1746 ],
1759 } 1747 }
OLDNEW
« no previous file with comments | « trunk/src/media/filters/h264_parser.cc ('k') | trunk/src/tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698