morgan/helium
1
0
Fork 0
mirror of https://github.com/morgan9e/helium synced 2026-04-14 08:24:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update Debian patches to 56.0.2924.76-4

Browse Source
This commit is contained in:
Eloston
2017-02-22 00:53:58 -08:00
parent 21651e39c7
commit d2d3237eb1
26 changed files with 212 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
resources/configs/common/patch_order
View File

@@ -1,14 +1,18 @@
debian/disable/pings.patch
debian/gn/parallel.patch
debian/gn/buildflags.patch
debian/gn/arm64.patch
debian/gn/arm64-toolchain.patch
debian/disable/promo.patch
debian/disable/extension-updater.patch
debian/disable/google-api-warning.patch
debian/disable/third-party-cookies.patch
debian/disable/external-components.patch
debian/disable/default-browser-warning.patch
debian/glibc2.24.patch
debian/gn.patch
debian/ps-print.patch
debian/build-flags.patch
debian/gpu-timeout.patch
debian/fixes/ps-print.patch
debian/fixes/glibc2.24.patch
debian/fixes/gpu-timeout.patch
debian/fixes/widevine-revision.patch
debian/fixes/chromedriver-revision.patch
debian/fixes/opus-no-neon.patch
debian/fixes/arm64-seccomp-memfd.patch
inox-patchset/chromium-icu58.patch
inox-patchset/fix-building-without-safebrowsing.patch

2
resources/configs/common_debian/patch_order
View File

@@ -1,2 +0,0 @@
common_debian/arm64-gcc-toolchain.patch
common_debian/arm64-gn.patch

1
resources/configs/linux_dynamic/patch_order
View File

@@ -1,7 +1,6 @@
linux_dynamic/manpage.patch
linux_dynamic/master-preferences.patch
linux_dynamic/chromedriver-revision.patch
linux_dynamic/system/icu.patch
linux_dynamic/system/vpx.patch

13
resources/patches/debian/disable/default-browser-warning.patch
View File

@@ -1,13 +0,0 @@
description: never show the default browser question
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -809,7 +809,7 @@ void StartupBrowserCreatorImpl::AddInfoB
browser->tab_strip_model()->GetActiveWebContents()));
#if !defined(OS_CHROMEOS)
- if (!command_line_.HasSwitch(switches::kNoDefaultBrowserCheck)) {
+ if (false) {
// Generally, the default browser prompt should not be shown on first
// run. However, when the set-as-default dialog has been suppressed, we
// need to allow it.

14
resources/patches/debian/disable/extension-updater.patch
View File

@@ -1,14 +0,0 @@
description: disable automatic extension updating
--- a/chrome/browser/extensions/extension_system_impl.cc
+++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -186,8 +186,7 @@ void ExtensionSystemImpl::Shared::Init(b
// ExtensionService depends on RuntimeData.
runtime_data_.reset(new RuntimeData(ExtensionRegistry::Get(profile_)));
- bool autoupdate_enabled = !profile_->IsGuestSession() &&
- !profile_->IsSystemProfile();
+ bool autoupdate_enabled = false;
#if defined(OS_CHROMEOS)
if (!extensions_enabled)
autoupdate_enabled = false;

2
resources/patches/debian/disable/external-components.patch
View File

@@ -2,7 +2,7 @@ description: disable loading external components
--- a/chrome/browser/extensions/external_component_loader.cc
+++ b/chrome/browser/extensions/external_component_loader.cc
@@ -39,6 +39,9 @@ ExternalComponentLoader::~ExternalCompon
@@ -41,6 +41,9 @@ ExternalComponentLoader::~ExternalCompon
void ExternalComponentLoader::StartLoading() {
prefs_.reset(new base::DictionaryValue());

2
resources/patches/debian/disable/google-api-warning.patch
View File

@@ -2,7 +2,7 @@ description: disable the google api key warning when those aren't found
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -805,8 +805,6 @@ void StartupBrowserCreatorImpl::AddInfoB
@@ -804,8 +804,6 @@ void StartupBrowserCreatorImpl::AddInfoB
if (is_process_startup == chrome::startup::IS_PROCESS_STARTUP &&
!command_line_.HasSwitch(switches::kTestType)) {
chrome::ShowBadFlagsPrompt(browser);

13
resources/patches/debian/disable/pings.patch
View File

@@ -1,13 +0,0 @@
description: disable pinging
--- a/components/component_updater/configurator_impl.cc
+++ b/components/component_updater/configurator_impl.cc
@@ -98,7 +98,7 @@ ConfiguratorImpl::ConfiguratorImpl(
cmdline->GetSwitchValueASCII(switches::kComponentUpdater), ",",
base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
fast_update_ = HasSwitchValue(switch_values, kSwitchFastUpdate);
- pings_enabled_ = !HasSwitchValue(switch_values, kSwitchDisablePings);
+ pings_enabled_ = false;
deltas_enabled_ = !HasSwitchValue(switch_values, kSwitchDisableDeltaUpdates);
#if defined(OS_WIN)

14
resources/patches/debian/disable/third-party-cookies.patch Normal file
View File

@@ -0,0 +1,14 @@
description: disable third-party cookies by default
author: Chad Miller <chad.miller@canonical.com>
--- a/components/content_settings/core/browser/cookie_settings.cc
+++ b/components/content_settings/core/browser/cookie_settings.cc
@@ -83,7 +83,7 @@ void CookieSettings::GetCookieSettings(
void CookieSettings::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
- prefs::kBlockThirdPartyCookies, false,
+ prefs::kBlockThirdPartyCookies, true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
}

60
resources/patches/debian/fixes/arm64-seccomp-memfd.patch Normal file
View File

@@ -0,0 +1,60 @@
From: Riku Voipio <riku.voipio@linaro.org>
Subject: seccomp-bpf: whitelist memfd_create on all architectures
Origin: upstream, https://chromium.googlesource.com/chromium/src/+/2cd89ce477eb1e5ec041612369f29d75e651919e
diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
index b30b3e6acef6..1d9f95cd6444 100644
--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
@@ -120,9 +120,7 @@ bool SyscallSets::IsFileSystem(int sysno) {
#if defined(__i386__) || defined(__arm__) || defined(__mips__)
case __NR_lstat64:
#endif
-#if defined(__i386__) || defined(__arm__) || defined(__x86_64__)
case __NR_memfd_create:
-#endif
case __NR_mkdirat:
case __NR_mknodat:
#if defined(__i386__)
diff --git a/sandbox/linux/system_headers/arm64_linux_syscalls.h b/sandbox/linux/system_headers/arm64_linux_syscalls.h
index 8acb2d100037..59d0eab8ecdc 100644
--- a/sandbox/linux/system_headers/arm64_linux_syscalls.h
+++ b/sandbox/linux/system_headers/arm64_linux_syscalls.h
@@ -1059,4 +1059,8 @@
#define __NR_getrandom 278
#endif
+#if !defined(__NR_memfd_create)
+#define __NR_memfd_create 279
+#endif
+
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
diff --git a/sandbox/linux/system_headers/mips64_linux_syscalls.h b/sandbox/linux/system_headers/mips64_linux_syscalls.h
index 5a179b073572..90f3d1bea8bf 100644
--- a/sandbox/linux/system_headers/mips64_linux_syscalls.h
+++ b/sandbox/linux/system_headers/mips64_linux_syscalls.h
@@ -1267,4 +1267,8 @@
#define __NR_getrandom (__NR_Linux + 313)
#endif
+#if !defined(__NR_memfd_create)
+#define __NR_memfd_create (__NR_Linux + 314)
+#endif
+
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS64_LINUX_SYSCALLS_H_
diff --git a/sandbox/linux/system_headers/mips_linux_syscalls.h b/sandbox/linux/system_headers/mips_linux_syscalls.h
index 819f9eb38b57..784d6b8ae085 100644
--- a/sandbox/linux/system_headers/mips_linux_syscalls.h
+++ b/sandbox/linux/system_headers/mips_linux_syscalls.h
@@ -1429,4 +1429,8 @@
#define __NR_getrandom (__NR_Linux + 353)
#endif
+#if !defined(__NR_memfd_create)
+#define __NR_memfd_create (__NR_Linux + 354)
+#endif
+
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_
--
2.11.0

0
resources/patches/linux_dynamic/chromedriver-revision.patch → resources/patches/debian/fixes/chromedriver-revision.patch
View File

0
resources/patches/debian/glibc2.24.patch → resources/patches/debian/fixes/glibc2.24.patch
View File

0
resources/patches/debian/gpu-timeout.patch → resources/patches/debian/fixes/gpu-timeout.patch
View File

58
resources/patches/debian/fixes/opus-no-neon.patch Normal file
View File

@@ -0,0 +1,58 @@
Description: [Opus] Only include NEON sources and macros when arm_use_neon==true
Origin: upstream, https://chromium.googlesource.com/chromium/src/+/22d06b0c916aa422a57e58d634cb73c2909b320d
arm_neon.h throws an error when included in a non-neon build. Only
include neon-related sources when use_arm_neon is true.
---
third_party/opus/BUILD.gn | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/third_party/opus/BUILD.gn b/third_party/opus/BUILD.gn
index 3bb5e0df499e..6211449f8a8a 100644
--- a/third_party/opus/BUILD.gn
+++ b/third_party/opus/BUILD.gn
@@ -371,12 +371,9 @@ static_library("opus") {
"src/celt/arm/arm_celt_map.c",
"src/celt/arm/armcpu.c",
"src/celt/arm/armcpu.h",
- "src/celt/arm/celt_neon_intr.c",
"src/celt/arm/fft_arm.h",
"src/celt/arm/mdct_arm.h",
"src/celt/arm/pitch_arm.h",
- "src/silk/arm/NSQ_neon.c",
- "src/silk/arm/NSQ_neon.h",
"src/silk/arm/arm_silk_map.c",
]
@@ -385,14 +382,25 @@ static_library("opus") {
defines += [
"OPUS_ARM_MAY_HAVE_EDSP",
"OPUS_ARM_MAY_HAVE_MEDIA",
- "OPUS_ARM_MAY_HAVE_NEON",
- "OPUS_ARM_MAY_HAVE_NEON_INTR",
"OPUS_HAVE_RTCD",
]
deps = [
":convert_rtcd_assembler",
]
+
+ if (arm_use_neon) {
+ sources += [
+ "src/celt/arm/celt_neon_intr.c",
+ "src/silk/arm/NSQ_neon.c",
+ "src/silk/arm/NSQ_neon.h",
+ ]
+
+ defines += [
+ "OPUS_ARM_MAY_HAVE_NEON",
+ "OPUS_ARM_MAY_HAVE_NEON_INTR",
+ ]
+ }
}
}
}
--
2.11.0

8
resources/patches/debian/ps-print.patch → resources/patches/debian/fixes/ps-print.patch
View File

@@ -1,9 +1,9 @@
description: add ps printing capability
description: add postscript (ps) printing capability
author: Salvatore Bonaccorso
--- a/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc
+++ b/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc
@@ -346,6 +346,7 @@ void PrintDialogGtk2::ShowDialog(
--- a/chrome/browser/ui/libgtkui/print_dialog_gtk.cc
+++ b/chrome/browser/ui/libgtkui/print_dialog_gtk.cc
@@ -348,6 +348,7 @@ void PrintDialogGtk2::ShowDialog(
// Since we only generate PDF, only show printers that support PDF.
// TODO(thestig) Add more capabilities to support?
GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(

13
resources/patches/debian/fixes/widevine-revision.patch Normal file
View File

@@ -0,0 +1,13 @@
description: set widevine version as undefined
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/widevine/cdm/stub/widevine_cdm_version.h
+++ b/third_party/widevine/cdm/stub/widevine_cdm_version.h
@@ -10,6 +10,7 @@
#include "third_party/widevine/cdm/widevine_cdm_common.h"
+#define WIDEVINE_CDM_VERSION_STRING "undefined"
#define WIDEVINE_CDM_AVAILABLE
#endif // WIDEVINE_CDM_VERSION_H_

8
resources/patches/common_debian/arm64-gcc-toolchain.patch → resources/patches/debian/gn/arm64-toolchain.patch
View File

@@ -4,11 +4,9 @@ Subject: Add gcc toolchain for arm64/linux
how arm, x86 and x86_64 also have both clang and gcc toolchains available.
Origin: upstream, https://chromium.googlesource.com/chromium/src.git/+/b9a43ab09791a1dcfd185141f71627c3b8d437db
Index: chromium-browser-54.0.2840.101/build/toolchain/linux/BUILD.gn
===================================================================
--- chromium-browser-54.0.2840.101.orig/build/toolchain/linux/BUILD.gn
+++ chromium-browser-54.0.2840.101/build/toolchain/linux/BUILD.gn
@@ -21,6 +21,24 @@ clang_toolchain("clang_arm64") {
--- a/build/toolchain/linux/BUILD.gn
+++ b/build/toolchain/linux/BUILD.gn
@@ -27,6 +27,24 @@ clang_toolchain("clang_arm64") {
}
}

14
resources/patches/common_debian/arm64-gn.patch → resources/patches/debian/gn/arm64.patch
View File

@@ -3,18 +3,16 @@ Subject: GN: Add Arm64 Linux support
Add Arm64 linux support be able to build GN binary for native arm64 builds.
Origin: upstream, https://chromium.googlesource.com/chromium/src.git/+/b9a43ab09791a1dcfd185141f71627c3b8d437db
Index: chromium-browser-54.0.2840.101/tools/gn/args.cc
===================================================================
--- chromium-browser-54.0.2840.101.orig/tools/gn/args.cc
+++ chromium-browser-54.0.2840.101/tools/gn/args.cc
@@ -268,6 +268,7 @@ void Args::SetSystemVarsLocked(Scope* de
--- a/tools/gn/args.cc
+++ b/tools/gn/args.cc
@@ -266,6 +266,7 @@ void Args::SetSystemVarsLocked(Scope* de
static const char kX86[] = "x86";
static const char kX64[] = "x64";
static const char kArm[] = "arm";
+ static const char kArm64[] = "arm64";
static const char kMips[] = "mipsel";
const char* arch = nullptr;
static const char kS390X[] = "s390x";
static const char kPPC64[] = "ppc64";
@@ -280,6 +281,8 @@ void Args::SetSystemVarsLocked(Scope* de
arch = kX64;
else if (os_arch.substr(0, 3) == "arm")
@@ -23,4 +21,4 @@ Index: chromium-browser-54.0.2840.101/tools/gn/args.cc
+ arch = kArm64;
else if (os_arch == "mips")
arch = kMips;
else
else if (os_arch == "s390x")

0
resources/patches/debian/build-flags.patch → resources/patches/debian/gn/buildflags.patch
View File

0
resources/patches/debian/gn.patch → resources/patches/debian/gn/parallel.patch
View File

30
resources/patches/linux_dynamic/gtk3theme.patch
View File

@@ -1,30 +0,0 @@
description: better integration with gtk3 themes
origin: https://bugs.archlinux.org/task/47682
--- a/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc
+++ b/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc
@@ -138,6 +138,11 @@ SkColor GetBGColor(GtkWidget* widget, Wi
gtk_widget_get_style_context(widget), stateMap[state], &color);
G_GNUC_END_IGNORE_DEPRECATIONS
+ if (color.alpha == 0.0)
+ gtk_style_context_get_background_color(
+ gtk_widget_get_style_context(gtk_widget_get_toplevel(widget)),
+ stateMap[state], &color);
+
// Hack for default color
if (color.alpha == 0.0)
color = {1, 1, 1, 1};
@@ -507,8 +512,11 @@ GtkWidget* NativeThemeGtk2::GetEntry() c
GtkWidget* NativeThemeGtk2::GetLabel() const {
static GtkWidget* fake_label = NULL;
- if (!fake_label)
+ if (!fake_label) {
fake_label = gtk_label_new("");
+ gtk_style_context_add_class(
+ gtk_widget_get_style_context(fake_label), "gtkstyle-fallback");
+ }
return fake_label;
}

8
resources/patches/linux_dynamic/manpage.patch
View File

@@ -12,7 +12,7 @@ Author: Daniel Echeverry <epsilon77@gmail.com>
.TH @@FILENAME@@ 1 "" "" "USER COMMANDS"
.SH NAME
@@ -20,6 +20,19 @@ This manpage only describes invocation,
@@ -20,6 +20,23 @@ This manpage only describes invocation,
@@NAME@@ has hundreds of undocumented command-line flags that are added
and removed at the whim of the developers. Here, we document relatively
stable flags.
@@ -28,11 +28,15 @@ Author: Daniel Echeverry <epsilon77@gmail.com>
+.TP
+\fB\-\-temp-profile\fR
+Use a throw-away/temporary profile for this session.
+
+.TP
+\fB\-\-enable-remote-extensions\fR
+Allow installation and updates of remote extensions.
+
.TP
\fB\-\-user\-data\-dir\fR=\fIDIR\fR
Specifies the directory that user data (your "profile") is kept in.
@@ -110,6 +123,7 @@ as
@@ -110,6 +127,7 @@ as
See the GTK documentation for more:
.IP
<http://library.gnome.org/devel/gtk/stable/gtk-running.html>

6
resources/patches/linux_dynamic/system/event.patch
View File

@@ -14,7 +14,7 @@ author: Michael Gilbert <mgilbert@debian.org>
#include "webrtc/base/task_queue_posix.h"
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -544,29 +544,9 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -543,29 +543,9 @@ def write_gn_ninja(path, root_gen_dir, o
'base/time/time_posix.cc',
'base/trace_event/heap_profiler_allocation_register_posix.cc',
])
@@ -45,7 +45,7 @@ author: Michael Gilbert <mgilbert@debian.org>
ldflags.extend(['-pthread'])
static_libraries['xdg_user_dirs'] = {
@@ -590,13 +570,6 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -589,13 +569,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/threading/platform_thread_linux.cc',
'base/trace_event/malloc_dump_provider.cc',
])
@@ -59,7 +59,7 @@ author: Michael Gilbert <mgilbert@debian.org>
if is_mac:
static_libraries['base']['sources'].extend([
@@ -625,12 +598,6 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -624,12 +597,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/threading/platform_thread_mac.mm',
'base/trace_event/malloc_dump_provider.cc',
])

2
resources/patches/linux_dynamic/system/ffmpeg.patch
View File

@@ -21,7 +21,7 @@ author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
#include <libavutil/imgutils.h>
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -1186,24 +1186,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
@@ -1198,24 +1198,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
// If no estimate is found, the stream entry will be kInfiniteDuration.
std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
kInfiniteDuration);

8
resources/patches/linux_dynamic/system/nspr.patch
View File

@@ -25,7 +25,7 @@ author: Michael Gilbert <mgilbert@debian.org>
namespace base {
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -467,7 +467,6 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -466,7 +466,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/third_party/dmg_fp/dtoa_wrapper.cc',
'base/third_party/dmg_fp/g_fmt.cc',
'base/third_party/icu/icu_utf.cc',
@@ -33,7 +33,7 @@ author: Michael Gilbert <mgilbert@debian.org>
'base/threading/non_thread_safe_impl.cc',
'base/threading/post_task_and_reply_impl.cc',
'base/threading/sequenced_task_runner_handle.cc',
@@ -567,7 +566,7 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -566,7 +565,7 @@ def write_gn_ninja(path, root_gen_dir, o
}
if is_linux:
@@ -44,7 +44,7 @@ author: Michael Gilbert <mgilbert@debian.org>
static_libraries['xdg_user_dirs'] = {
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -52,6 +52,9 @@ config("base_flags") {
@@ -49,6 +49,9 @@ config("base_flags") {
"-Wno-char-subscripts",
]
}
@@ -54,7 +54,7 @@ author: Michael Gilbert <mgilbert@debian.org>
}
config("base_implementation") {
@@ -823,8 +826,6 @@ component("base") {
@@ -833,8 +836,6 @@ component("base") {
"third_party/dmg_fp/g_fmt.cc",
"third_party/icu/icu_utf.cc",
"third_party/icu/icu_utf.h",

43
resources/patches/linux_dynamic/system/vpx.patch
View File

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/webrtc/modules/video_coding/BUILD.gn
+++ b/third_party/webrtc/modules/video_coding/BUILD.gn
@@ -88,7 +88,6 @@ rtc_static_library("video_coding") {
@@ -89,7 +89,6 @@ rtc_static_library("video_coding") {
":webrtc_h264",
":webrtc_i420",
":webrtc_vp8",
@@ -13,32 +13,27 @@ author: Michael Gilbert <mgilbert@debian.org>
"../../system_wrappers",
--- a/third_party/webrtc/video/video_encoder.cc
+++ b/third_party/webrtc/video/video_encoder.cc
@@ -24,9 +24,6 @@ VideoEncoder* VideoEncoder::Create(Video
@@ -24,8 +24,6 @@ VideoEncoder* VideoEncoder::Create(Video
return H264Encoder::Create();
case kVp8:
return VP8Encoder::Create();
- case kVp9:
- RTC_DCHECK(VP9Encoder::IsSupported());
- return VP9Encoder::Create();
case kUnsupportedCodec:
RTC_NOTREACHED();
return nullptr;
--- a/third_party/webrtc/media/engine/webrtcvideoengine2.cc
+++ b/third_party/webrtc/media/engine/webrtcvideoengine2.cc
@@ -161,10 +161,6 @@ bool CodecIsInternallySupported(const st
if (CodecNamesEq(codec_name, kVp8CodecName)) {
return true;
}
- if (CodecNamesEq(codec_name, kVp9CodecName)) {
- return webrtc::VP9Encoder::IsSupported() &&
- webrtc::VP9Decoder::IsSupported();
- }
if (CodecNamesEq(codec_name, kH264CodecName)) {
return webrtc::H264Encoder::IsSupported() &&
webrtc::H264Decoder::IsSupported();
@@ -40,8 +38,6 @@ bool VideoEncoder::IsSupportedSoftware(E
return H264Encoder::IsSupported();
case kVp8:
return true;
- case kVp9:
- return VP9Encoder::IsSupported();
case kUnsupportedCodec:
RTC_NOTREACHED();
return false;
--- a/third_party/webrtc/modules/video_coding/codec_database.cc
+++ b/third_party/webrtc/modules/video_coding/codec_database.cc
@@ -576,8 +576,6 @@ VCMGenericDecoder* VCMCodecDataBase::Cre
@@ -573,8 +573,6 @@ VCMGenericDecoder* VCMCodecDataBase::Cre
switch (type) {
case kVideoCodecVP8:
return new VCMGenericDecoder(VP8Decoder::Create());
@@ -59,3 +54,17 @@ author: Michael Gilbert <mgilbert@debian.org>
case kUnsupportedCodec:
LOG(LS_ERROR) << "Creating NullVideoDecoder for unsupported codec.";
return new NullVideoDecoder();
--- a/third_party/webrtc/media/engine/webrtcvideoengine2.cc
+++ b/third_party/webrtc/media/engine/webrtcvideoengine2.cc
@@ -433,11 +433,6 @@ std::vector<VideoCodec> DefaultVideoCode
AddCodecAndMaybeRtxCodec(
MakeVideoCodecWithDefaultFeedbackParams(kDefaultVp8PlType, kVp8CodecName),
&codecs);
- if (webrtc::VP9Encoder::IsSupported() && webrtc::VP9Decoder::IsSupported()) {
- AddCodecAndMaybeRtxCodec(MakeVideoCodecWithDefaultFeedbackParams(
- kDefaultVp9PlType, kVp9CodecName),
- &codecs);
- }
if (webrtc::H264Encoder::IsSupported() &&
webrtc::H264Decoder::IsSupported()) {
VideoCodec codec = MakeVideoCodecWithDefaultFeedbackParams(