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

Side by Side Diff: content/content_common.gypi

Issue 356903002: Revert "Revert 279650 "Add VaapiVideoEncodeAccelerator for HW-accelerate..."" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
« no previous file with comments | « content/common/sandbox_linux/bpf_gpu_policy_linux.cc ('k') | content/content_tests.gypi » ('j') | 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 'dependencies': [ 6 'dependencies': [
7 '../base/base.gyp:base', 7 '../base/base.gyp:base',
8 '../components/tracing.gyp:tracing', 8 '../components/tracing.gyp:tracing',
9 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', 9 '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
10 '../net/net.gyp:net', 10 '../net/net.gyp:net',
(...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after
716 'common/gpu/media/v4l2_video_device.cc', 716 'common/gpu/media/v4l2_video_device.cc',
717 'common/gpu/media/v4l2_video_device.h', 717 'common/gpu/media/v4l2_video_device.h',
718 'common/gpu/media/v4l2_video_encode_accelerator.cc', 718 'common/gpu/media/v4l2_video_encode_accelerator.cc',
719 'common/gpu/media/v4l2_video_encode_accelerator.h', 719 'common/gpu/media/v4l2_video_encode_accelerator.h',
720 ], 720 ],
721 'include_dirs': [ 721 'include_dirs': [
722 '<(DEPTH)/third_party/khronos', 722 '<(DEPTH)/third_party/khronos',
723 ], 723 ],
724 }], 724 }],
725 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', { 725 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
726 'dependencies': [
727 '../media/media.gyp:media',
728 '../third_party/libyuv/libyuv.gyp:libyuv',
729 ],
726 'sources': [ 730 'sources': [
727 'common/gpu/media/h264_dpb.cc', 731 'common/gpu/media/h264_dpb.cc',
728 'common/gpu/media/h264_dpb.h', 732 'common/gpu/media/h264_dpb.h',
729 'common/gpu/media/va_surface.h', 733 'common/gpu/media/va_surface.h',
730 'common/gpu/media/vaapi_h264_decoder.cc', 734 'common/gpu/media/vaapi_h264_decoder.cc',
731 'common/gpu/media/vaapi_h264_decoder.h', 735 'common/gpu/media/vaapi_h264_decoder.h',
732 'common/gpu/media/vaapi_video_decode_accelerator.cc', 736 'common/gpu/media/vaapi_video_decode_accelerator.cc',
733 'common/gpu/media/vaapi_video_decode_accelerator.h', 737 'common/gpu/media/vaapi_video_decode_accelerator.h',
738 'common/gpu/media/vaapi_video_encode_accelerator.cc',
739 'common/gpu/media/vaapi_video_encode_accelerator.h',
734 'common/gpu/media/vaapi_wrapper.cc', 740 'common/gpu/media/vaapi_wrapper.cc',
735 'common/gpu/media/vaapi_wrapper.h', 741 'common/gpu/media/vaapi_wrapper.h',
736 ], 742 ],
737 'variables': { 743 'variables': {
738 'generate_stubs_script': '../tools/generate_stubs/generate_stubs.py', 744 'generate_stubs_script': '../tools/generate_stubs/generate_stubs.py',
739 'extra_header': 'common/gpu/media/va_stub_header.fragment', 745 'extra_header': 'common/gpu/media/va_stub_header.fragment',
740 'sig_files': ['common/gpu/media/va.sigs'], 746 'sig_files': ['common/gpu/media/va.sigs'],
741 'outfile_type': 'posix_stubs', 747 'outfile_type': 'posix_stubs',
742 'stubs_filename_root': 'va_stubs', 748 'stubs_filename_root': 'va_stubs',
743 'project_path': 'content/common/gpu/media', 749 'project_path': 'content/common/gpu/media',
744 'intermediate_dir': '<(INTERMEDIATE_DIR)', 750 'intermediate_dir': '<(INTERMEDIATE_DIR)',
745 'output_root': '<(SHARED_INTERMEDIATE_DIR)/va', 751 'output_root': '<(SHARED_INTERMEDIATE_DIR)/va',
746 }, 752 },
747 'include_dirs': [ 753 'include_dirs': [
748 '<(DEPTH)/third_party/libva', 754 '<(DEPTH)/third_party/libva',
755 '<(DEPTH)/third_party/libyuv',
749 '<(output_root)', 756 '<(output_root)',
750 ], 757 ],
751 'actions': [ 758 'actions': [
752 { 759 {
753 'action_name': 'generate_stubs', 760 'action_name': 'generate_stubs',
754 'inputs': [ 761 'inputs': [
755 '<(generate_stubs_script)', 762 '<(generate_stubs_script)',
756 '<(extra_header)', 763 '<(extra_header)',
757 '<@(sig_files)', 764 '<@(sig_files)',
758 ], 765 ],
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
850 }, { 857 }, {
851 'defines': ['USE_SECCOMP_BPF'], 858 'defines': ['USE_SECCOMP_BPF'],
852 }], 859 }],
853 ['use_ozone==1', { 860 ['use_ozone==1', {
854 'dependencies': [ 861 'dependencies': [
855 '../ui/ozone/ozone.gyp:ozone', 862 '../ui/ozone/ozone.gyp:ozone',
856 ], 863 ],
857 }], 864 }],
858 ], 865 ],
859 } 866 }
OLDNEW
« no previous file with comments | « content/common/sandbox_linux/bpf_gpu_policy_linux.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698