From dcd7677a8b3c4fd683ff931717ebb359edb85d5d Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Wed, 12 Aug 2015 13:22:18 +0000 Subject: chromium-dev: rebased chromium_vaapi.patch against chromium-dev 46.0.2478.0 sources --- chromium-dev/build/patches/chromium_vaapi.patch | 114 ++++++++++++------------ 1 file changed, 57 insertions(+), 57 deletions(-) (limited to 'chromium-dev/build/patches/chromium_vaapi.patch') diff --git a/chromium-dev/build/patches/chromium_vaapi.patch b/chromium-dev/build/patches/chromium_vaapi.patch index cd716bcc..080fd9db 100644 --- a/chromium-dev/build/patches/chromium_vaapi.patch +++ b/chromium-dev/build/patches/chromium_vaapi.patch @@ -1,25 +1,25 @@ # # Taken from: -# https://code.launchpad.net/~saiarcot895/chromium-browser/chromium-browser.vivid.dev -# And rebased against chromium-dev 44.0.2398.0 sources. +# https://code.launchpad.net/~saiarcot895/chromium-browser/chromium-browser.wily.dev +# And rebased against chromium-dev 46.0.2478.0 sources. # -diff -uarN chromium-44.0.2398.0.orig/chrome/browser/about_flags.cc chromium-44.0.2398.0/chrome/browser/about_flags.cc ---- chromium-44.0.2398.0.orig/chrome/browser/about_flags.cc 2015-05-11 09:58:19.000000000 +0200 -+++ chromium-44.0.2398.0/chrome/browser/about_flags.cc 2015-05-21 12:08:48.252309710 +0200 -@@ -1100,7 +1100,7 @@ - { "disable-accelerated-video-decode", - IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME, - IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION, -- kOsMac | kOsWin | kOsCrOS, -+ kOsAll, - SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), - }, +diff -uarN chromium-46.0.2478.0.orig/chrome/browser/about_flags.cc chromium-46.0.2478.0/chrome/browser/about_flags.cc +--- chromium-46.0.2478.0.orig/chrome/browser/about_flags.cc 2015-08-09 21:01:31.000000000 +0200 ++++ chromium-46.0.2478.0/chrome/browser/about_flags.cc 2015-08-12 14:27:02.671697290 +0200 +@@ -1011,7 +1011,7 @@ + "disable-accelerated-video-decode", + IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME, + IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION, +- kOsMac | kOsWin | kOsCrOS, ++ kOsAll, + SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), + }, #if defined(USE_ASH) -diff -uarN chromium-44.0.2398.0.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc chromium-44.0.2398.0/content/common/gpu/media/gpu_video_decode_accelerator.cc ---- chromium-44.0.2398.0.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc 2015-05-11 09:58:24.000000000 +0200 -+++ chromium-44.0.2398.0/content/common/gpu/media/gpu_video_decode_accelerator.cc 2015-05-21 12:08:48.235306888 +0200 -@@ -31,7 +31,7 @@ +diff -uarN chromium-46.0.2478.0.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc chromium-46.0.2478.0/content/common/gpu/media/gpu_video_decode_accelerator.cc +--- chromium-46.0.2478.0.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc 2015-08-07 22:29:22.000000000 +0200 ++++ chromium-46.0.2478.0/content/common/gpu/media/gpu_video_decode_accelerator.cc 2015-08-12 14:27:02.560679020 +0200 +@@ -33,7 +33,7 @@ #include "content/common/gpu/media/dxva_video_decode_accelerator.h" #elif defined(OS_MACOSX) #include "content/common/gpu/media/vt_video_decode_accelerator.h" @@ -28,7 +28,7 @@ diff -uarN chromium-44.0.2398.0.orig/content/common/gpu/media/gpu_video_decode_a #if defined(USE_V4L2_CODEC) #include "content/common/gpu/media/v4l2_device.h" #include "content/common/gpu/media/v4l2_slice_video_decode_accelerator.h" -@@ -344,7 +344,7 @@ +@@ -346,7 +346,7 @@ scoped_ptr GpuVideoDecodeAccelerator::CreateVaapiVDA() { scoped_ptr decoder; @@ -37,10 +37,10 @@ diff -uarN chromium-44.0.2398.0.orig/content/common/gpu/media/gpu_video_decode_a decoder.reset(new VaapiVideoDecodeAccelerator( make_context_current_, base::Bind(&GpuVideoDecodeAccelerator::BindImage, base::Unretained(this)))); -diff -uarN chromium-44.0.2398.0.orig/content/common/gpu/media/vaapi_wrapper.cc chromium-44.0.2398.0/content/common/gpu/media/vaapi_wrapper.cc ---- chromium-44.0.2398.0.orig/content/common/gpu/media/vaapi_wrapper.cc 2015-05-11 09:58:24.000000000 +0200 -+++ chromium-44.0.2398.0/content/common/gpu/media/vaapi_wrapper.cc 2015-05-21 12:08:48.252309710 +0200 -@@ -143,7 +143,7 @@ +diff -uarN chromium-46.0.2478.0.orig/content/common/gpu/media/vaapi_wrapper.cc chromium-46.0.2478.0/content/common/gpu/media/vaapi_wrapper.cc +--- chromium-46.0.2478.0.orig/content/common/gpu/media/vaapi_wrapper.cc 2015-08-07 22:29:22.000000000 +0200 ++++ chromium-46.0.2478.0/content/common/gpu/media/vaapi_wrapper.cc 2015-08-12 14:27:02.681698936 +0200 +@@ -146,7 +146,7 @@ VAProfile va_profile, const base::Closure& report_error_to_uma_cb) { if (!profile_infos_.Get().IsProfileSupported(mode, va_profile)) { @@ -49,7 +49,7 @@ diff -uarN chromium-44.0.2398.0.orig/content/common/gpu/media/vaapi_wrapper.cc c return nullptr; } -@@ -386,7 +386,7 @@ +@@ -384,7 +384,7 @@ if (std::find(supported_entrypoints.begin(), supported_entrypoints.end(), entrypoint) == supported_entrypoints.end()) { @@ -58,7 +58,7 @@ diff -uarN chromium-44.0.2398.0.orig/content/common/gpu/media/vaapi_wrapper.cc c return false; } return true; -@@ -410,8 +410,8 @@ +@@ -408,8 +408,8 @@ if (attribs[i].type != required_attribs[i].type || (attribs[i].value & required_attribs[i].value) != required_attribs[i].value) { @@ -69,9 +69,9 @@ diff -uarN chromium-44.0.2398.0.orig/content/common/gpu/media/vaapi_wrapper.cc c return false; } } -diff -uarN chromium-44.0.2398.0.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc chromium-44.0.2398.0/content/common/sandbox_linux/bpf_gpu_policy_linux.cc ---- chromium-44.0.2398.0.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc 2015-05-11 09:58:24.000000000 +0200 -+++ chromium-44.0.2398.0/content/common/sandbox_linux/bpf_gpu_policy_linux.cc 2015-05-21 12:08:48.251309544 +0200 +diff -uarN chromium-46.0.2478.0.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc chromium-46.0.2478.0/content/common/sandbox_linux/bpf_gpu_policy_linux.cc +--- chromium-46.0.2478.0.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc 2015-08-07 22:29:22.000000000 +0200 ++++ chromium-46.0.2478.0/content/common/sandbox_linux/bpf_gpu_policy_linux.cc 2015-08-12 14:27:02.658695149 +0200 @@ -21,6 +21,8 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" @@ -111,7 +111,7 @@ diff -uarN chromium-44.0.2398.0.orig/content/common/sandbox_linux/bpf_gpu_policy const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); accelerated_encode_enabled = -@@ -295,23 +304,41 @@ +@@ -299,23 +308,41 @@ // inside the sandbox, so preload them now. if (IsAcceleratedVaapiVideoEncodeEnabled() || IsAcceleratedVideoDecodeEnabled()) { @@ -167,10 +167,10 @@ diff -uarN chromium-44.0.2398.0.orig/content/common/sandbox_linux/bpf_gpu_policy return true; } -diff -uarN chromium-44.0.2398.0.orig/content/content_common.gypi chromium-44.0.2398.0/content/content_common.gypi ---- chromium-44.0.2398.0.orig/content/content_common.gypi 2015-05-11 09:58:24.000000000 +0200 -+++ chromium-44.0.2398.0/content/content_common.gypi 2015-05-21 12:08:48.236307054 +0200 -@@ -822,7 +822,7 @@ +diff -uarN chromium-46.0.2478.0.orig/content/content_common.gypi chromium-46.0.2478.0/content/content_common.gypi +--- chromium-46.0.2478.0.orig/content/content_common.gypi 2015-08-09 21:01:31.000000000 +0200 ++++ chromium-46.0.2478.0/content/content_common.gypi 2015-08-12 14:27:02.571680830 +0200 +@@ -854,7 +854,7 @@ }, ], }], @@ -179,7 +179,7 @@ diff -uarN chromium-44.0.2398.0.orig/content/content_common.gypi chromium-44.0.2 'sources': [ 'common/gpu/media/accelerated_video_decoder.h', 'common/gpu/media/h264_decoder.cc', -@@ -871,7 +871,7 @@ +@@ -906,7 +906,7 @@ 'common/gpu/media/tegra_v4l2_device.h', ], }], @@ -188,9 +188,9 @@ diff -uarN chromium-44.0.2398.0.orig/content/content_common.gypi chromium-44.0.2 'dependencies': [ '../media/media.gyp:media', '../third_party/libyuv/libyuv.gyp:libyuv', -diff -uarN chromium-44.0.2398.0.orig/content/content_gpu.gypi chromium-44.0.2398.0/content/content_gpu.gypi ---- chromium-44.0.2398.0.orig/content/content_gpu.gypi 2015-05-11 09:58:24.000000000 +0200 -+++ chromium-44.0.2398.0/content/content_gpu.gypi 2015-05-21 12:08:48.236307054 +0200 +diff -uarN chromium-46.0.2478.0.orig/content/content_gpu.gypi chromium-46.0.2478.0/content/content_gpu.gypi +--- chromium-46.0.2478.0.orig/content/content_gpu.gypi 2015-08-07 22:29:22.000000000 +0200 ++++ chromium-46.0.2478.0/content/content_gpu.gypi 2015-08-12 14:27:02.571680830 +0200 @@ -36,7 +36,7 @@ ], }, @@ -200,10 +200,10 @@ diff -uarN chromium-44.0.2398.0.orig/content/content_gpu.gypi chromium-44.0.2398 'include_dirs': [ '<(DEPTH)/third_party/libva', ], -diff -uarN chromium-44.0.2398.0.orig/content/content_tests.gypi chromium-44.0.2398.0/content/content_tests.gypi ---- chromium-44.0.2398.0.orig/content/content_tests.gypi 2015-05-11 09:58:24.000000000 +0200 -+++ chromium-44.0.2398.0/content/content_tests.gypi 2015-05-21 12:08:48.237307220 +0200 -@@ -1648,7 +1648,7 @@ +diff -uarN chromium-46.0.2478.0.orig/content/content_tests.gypi chromium-46.0.2478.0/content/content_tests.gypi +--- chromium-46.0.2478.0.orig/content/content_tests.gypi 2015-08-10 21:00:40.000000000 +0200 ++++ chromium-46.0.2478.0/content/content_tests.gypi 2015-08-12 14:27:02.593684451 +0200 +@@ -1706,7 +1706,7 @@ }, ] }], @@ -212,10 +212,10 @@ diff -uarN chromium-44.0.2398.0.orig/content/content_tests.gypi chromium-44.0.23 'targets': [ { 'target_name': 'vaapi_jpeg_decoder_unittest', -diff -uarN chromium-44.0.2398.0.orig/content/public/common/content_switches.cc chromium-44.0.2398.0/content/public/common/content_switches.cc ---- chromium-44.0.2398.0.orig/content/public/common/content_switches.cc 2015-05-11 10:11:08.000000000 +0200 -+++ chromium-44.0.2398.0/content/public/common/content_switches.cc 2015-05-21 12:08:48.249309212 +0200 -@@ -943,7 +943,7 @@ +diff -uarN chromium-46.0.2478.0.orig/content/public/common/content_switches.cc chromium-46.0.2478.0/content/public/common/content_switches.cc +--- chromium-46.0.2478.0.orig/content/public/common/content_switches.cc 2015-08-09 21:01:31.000000000 +0200 ++++ chromium-46.0.2478.0/content/public/common/content_switches.cc 2015-08-12 14:27:02.614687907 +0200 +@@ -964,7 +964,7 @@ // Disable web audio API. const char kDisableWebAudio[] = "disable-webaudio"; @@ -224,10 +224,10 @@ diff -uarN chromium-44.0.2398.0.orig/content/public/common/content_switches.cc c // Disables panel fitting (used for mirror mode). const char kDisablePanelFitting[] = "disable-panel-fitting"; -diff -uarN chromium-44.0.2398.0.orig/content/public/common/content_switches.h chromium-44.0.2398.0/content/public/common/content_switches.h ---- chromium-44.0.2398.0.orig/content/public/common/content_switches.h 2015-05-11 10:11:08.000000000 +0200 -+++ chromium-44.0.2398.0/content/public/common/content_switches.h 2015-05-21 12:08:48.250309378 +0200 -@@ -269,7 +269,7 @@ +diff -uarN chromium-46.0.2478.0.orig/content/public/common/content_switches.h chromium-46.0.2478.0/content/public/common/content_switches.h +--- chromium-46.0.2478.0.orig/content/public/common/content_switches.h 2015-08-09 21:01:31.000000000 +0200 ++++ chromium-46.0.2478.0/content/public/common/content_switches.h 2015-08-12 14:27:02.615688072 +0200 +@@ -276,7 +276,7 @@ CONTENT_EXPORT extern const char kDisableWebAudio[]; @@ -236,10 +236,10 @@ diff -uarN chromium-44.0.2398.0.orig/content/public/common/content_switches.h ch CONTENT_EXPORT extern const char kDisablePanelFitting[]; CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[]; #endif -diff -uarN chromium-44.0.2398.0.orig/gpu/config/software_rendering_list_json.cc chromium-44.0.2398.0/gpu/config/software_rendering_list_json.cc ---- chromium-44.0.2398.0.orig/gpu/config/software_rendering_list_json.cc 2015-05-11 09:58:24.000000000 +0200 -+++ chromium-44.0.2398.0/gpu/config/software_rendering_list_json.cc 2015-05-21 12:08:48.251309544 +0200 -@@ -475,17 +475,6 @@ +diff -uarN chromium-46.0.2478.0.orig/gpu/config/software_rendering_list_json.cc chromium-46.0.2478.0/gpu/config/software_rendering_list_json.cc +--- chromium-46.0.2478.0.orig/gpu/config/software_rendering_list_json.cc 2015-08-07 22:29:23.000000000 +0200 ++++ chromium-46.0.2478.0/gpu/config/software_rendering_list_json.cc 2015-08-12 14:27:02.641692352 +0200 +@@ -481,17 +481,6 @@ ] }, { @@ -257,7 +257,7 @@ diff -uarN chromium-44.0.2398.0.orig/gpu/config/software_rendering_list_json.cc "id": 49, "description": "NVidia GeForce GT 650M can cause the system to hang with flash 3D", "cr_bugs": [140175], -@@ -1034,6 +1023,11 @@ +@@ -1041,6 +1030,11 @@ "op": ">=", "value": "3.0" } @@ -269,10 +269,10 @@ diff -uarN chromium-44.0.2398.0.orig/gpu/config/software_rendering_list_json.cc } ], "features": [ -diff -uarN chromium-44.0.2398.0.orig/media/media.gyp chromium-44.0.2398.0/media/media.gyp ---- chromium-44.0.2398.0.orig/media/media.gyp 2015-05-11 10:11:08.000000000 +0200 -+++ chromium-44.0.2398.0/media/media.gyp 2015-05-21 12:08:48.250309378 +0200 -@@ -703,7 +703,7 @@ +diff -uarN chromium-46.0.2478.0.orig/media/media.gyp chromium-46.0.2478.0/media/media.gyp +--- chromium-46.0.2478.0.orig/media/media.gyp 2015-08-09 21:01:31.000000000 +0200 ++++ chromium-46.0.2478.0/media/media.gyp 2015-08-12 14:27:02.633691036 +0200 +@@ -752,7 +752,7 @@ ], }], # For VaapiVideoEncodeAccelerator. -- cgit v1.2.3-65-gdbad