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

Side by Side Diff: content/content_common.gypi

Issue 799543005: Add use_v4l2_codec use flag to include v4l2 codec on x86 CrOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move use_v4l2_codec to media_option Created 5 years, 11 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 '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 13 matching lines...) Expand all
24 '..', 24 '..',
25 ], 25 ],
26 'export_dependent_settings': [ 26 'export_dependent_settings': [
27 '../base/base.gyp:base', 27 '../base/base.gyp:base',
28 # The public content API headers directly include Blink API headers, so we 28 # The public content API headers directly include Blink API headers, so we
29 # have to export the blink header settings so that relative paths in these 29 # have to export the blink header settings so that relative paths in these
30 # headers resolve correctly. 30 # headers resolve correctly.
31 '../third_party/WebKit/public/blink_headers.gyp:blink_headers', 31 '../third_party/WebKit/public/blink_headers.gyp:blink_headers',
32 ], 32 ],
33 'variables': { 33 'variables': {
34 'use_v4l2_codec%': 0,
34 'public_common_sources': [ 35 'public_common_sources': [
35 'public/common/appcache_info.h', 36 'public/common/appcache_info.h',
36 'public/common/bindings_policy.h', 37 'public/common/bindings_policy.h',
37 'public/common/child_process_host.h', 38 'public/common/child_process_host.h',
38 'public/common/child_process_host_delegate.cc', 39 'public/common/child_process_host_delegate.cc',
39 'public/common/child_process_host_delegate.h', 40 'public/common/child_process_host_delegate.h',
40 'public/common/child_process_sandbox_support_linux.h', 41 'public/common/child_process_sandbox_support_linux.h',
41 'public/common/color_suggestion.cc', 42 'public/common/color_suggestion.cc',
42 'public/common/color_suggestion.h', 43 'public/common/color_suggestion.h',
43 'public/common/common_param_traits.cc', 44 'public/common/common_param_traits.cc',
(...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after
752 'sources': [ 753 'sources': [
753 'common/gpu/media/android_video_encode_accelerator.cc', 754 'common/gpu/media/android_video_encode_accelerator.cc',
754 'common/gpu/media/android_video_encode_accelerator.h', 755 'common/gpu/media/android_video_encode_accelerator.h',
755 ], 756 ],
756 }], 757 }],
757 ['enable_webrtc==1', { 758 ['enable_webrtc==1', {
758 'dependencies': [ 759 'dependencies': [
759 '../third_party/libjingle/libjingle.gyp:libjingle', 760 '../third_party/libjingle/libjingle.gyp:libjingle',
760 ], 761 ],
761 }], 762 }],
762 ['target_arch=="arm" and chromeos == 1 and use_x11 == 1', { 763 ['chromeos==1 and ((target_arch=="arm" and use_x11==1) or use_v4l2_codec==1) ', {
763 'dependencies': [ 764 'dependencies': [
764 '../media/media.gyp:media', 765 '../media/media.gyp:media',
765 ], 766 ],
766 'sources': [ 767 'sources': [
767 'common/gpu/media/generic_v4l2_video_device.cc', 768 'common/gpu/media/generic_v4l2_video_device.cc',
768 'common/gpu/media/generic_v4l2_video_device.h', 769 'common/gpu/media/generic_v4l2_video_device.h',
769 'common/gpu/media/tegra_v4l2_video_device.cc',
770 'common/gpu/media/tegra_v4l2_video_device.h',
771 'common/gpu/media/v4l2_image_processor.cc', 770 'common/gpu/media/v4l2_image_processor.cc',
772 'common/gpu/media/v4l2_image_processor.h', 771 'common/gpu/media/v4l2_image_processor.h',
773 'common/gpu/media/v4l2_video_decode_accelerator.cc', 772 'common/gpu/media/v4l2_video_decode_accelerator.cc',
774 'common/gpu/media/v4l2_video_decode_accelerator.h', 773 'common/gpu/media/v4l2_video_decode_accelerator.h',
775 'common/gpu/media/v4l2_video_device.cc', 774 'common/gpu/media/v4l2_video_device.cc',
776 'common/gpu/media/v4l2_video_device.h', 775 'common/gpu/media/v4l2_video_device.h',
777 'common/gpu/media/v4l2_video_encode_accelerator.cc', 776 'common/gpu/media/v4l2_video_encode_accelerator.cc',
778 'common/gpu/media/v4l2_video_encode_accelerator.h', 777 'common/gpu/media/v4l2_video_encode_accelerator.h',
779 ], 778 ],
780 'include_dirs': [ 779 'include_dirs': [
781 '<(DEPTH)/third_party/khronos', 780 '<(DEPTH)/third_party/khronos',
782 ], 781 ],
782 'conditions': [
783 ['target_arch == "arm"', {
784 'sources': [
785 'common/gpu/media/tegra_v4l2_video_device.cc',
786 'common/gpu/media/tegra_v4l2_video_device.h',
787 ],
788 }],
789 ],
783 }], 790 }],
784 ['target_arch != "arm" and chromeos == 1', { 791 ['target_arch != "arm" and chromeos == 1', {
785 'dependencies': [ 792 'dependencies': [
786 '../media/media.gyp:media', 793 '../media/media.gyp:media',
787 '../third_party/libyuv/libyuv.gyp:libyuv', 794 '../third_party/libyuv/libyuv.gyp:libyuv',
788 ], 795 ],
789 'sources': [ 796 'sources': [
790 'common/gpu/media/h264_dpb.cc', 797 'common/gpu/media/h264_dpb.cc',
791 'common/gpu/media/h264_dpb.h', 798 'common/gpu/media/h264_dpb.h',
792 'common/gpu/media/va_surface.h', 799 'common/gpu/media/va_surface.h',
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
960 'common/gpu/client/gpu_memory_buffer_impl_ozone.cc', 967 'common/gpu/client/gpu_memory_buffer_impl_ozone.cc',
961 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc', 968 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc',
962 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h', 969 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h',
963 'common/gpu/gpu_memory_buffer_factory_ozone.cc', 970 'common/gpu/gpu_memory_buffer_factory_ozone.cc',
964 'common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc', 971 'common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc',
965 'common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h', 972 'common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h',
966 ], 973 ],
967 }], 974 }],
968 ], 975 ],
969 } 976 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698