[Pkg-chromium-commit] [pkg-chromium] 01/01: release 57.0.2987.98-1
Michael Gilbert
mgilbert at moszumanska.debian.org
Sat Mar 11 06:36:44 UTC 2017
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository pkg-chromium.
commit bcb4f0eb43d59e63865da5e69a66d51f2601e377
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sat Mar 11 06:36:24 2017 +0000
release 57.0.2987.98-1
---
debian/changelog | 29 +++++++++
debian/copyright | 3 +
debian/patches/disable/google-api-warning.patch | 6 +-
debian/patches/disable/third-party-cookies.patch | 2 +-
debian/patches/fixes/glibc2.24.patch | 17 -----
debian/patches/fixes/opus-no-neon.patch | 58 -----------------
debian/patches/fixes/ps-print.patch | 2 +-
debian/patches/gn/arm64-toolchain.patch | 33 ----------
debian/patches/gn/arm64.patch | 24 -------
debian/patches/gn/buildflags.patch | 6 +-
debian/patches/gn/parallel.patch | 2 +-
debian/patches/series | 5 --
debian/patches/system/event.patch | 6 +-
debian/patches/system/ffmpeg.patch | 2 +-
debian/patches/system/icu.patch | 2 +-
debian/patches/system/nspr.patch | 10 +--
debian/patches/system/vpx.patch | 82 ++++++++++--------------
17 files changed, 85 insertions(+), 204 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3bba800..e6b5a82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,32 @@
+chromium-browser (57.0.2987.98-1) unstable; urgency=medium
+
+ * New upstream stable release.
+ - CVE-2017-5030: Memory corruption in V8. Credit to Brendon Tiszka
+ - CVE-2017-5031: Use after free in ANGLE. Credit to Looben Yang
+ - CVE-2017-5032: Out of bounds write in PDFium. Credit to Ashfaq Ansari
+ - CVE-2017-5029: Integer overflow in libxslt. Credit to Holger Fuhrmannek
+ - CVE-2017-5034: Use after free in PDFium. Credit to Ke Liu
+ - CVE-2017-5035: Incorrect security UI in Omnibox. Credit to Enzo Aguado
+ - CVE-2017-5036: Use after free in PDFium. Credit to Anonymous
+ - CVE-2017-5037: Multiple out of bounds writes in ChunkDemuxer. Credit to
+ Yongke Wang
+ - CVE-2017-5039: Use after free in PDFium. Credit to jinmo123
+ - CVE-2017-5040: Information disclosure in V8. Credit to Choongwoo Han
+ - CVE-2017-5041: Address spoofing in Omnibox. Credit to Jordi Chancel
+ - CVE-2017-5033: Bypass of Content Security Policy in Blink. Credit to
+ Nicolai Grødum
+ - CVE-2017-5042: Incorrect handling of cookies in Cast. Credit to Mike
+ Ruddy
+ - CVE-2017-5038: Use after free in GuestView. Credit to Anonymous
+ - CVE-2017-5043: Use after free in GuestView. Credit to Anonymous
+ - CVE-2017-5044: Heap overflow in Skia. Credit to Kushal Arvind Shah
+ - CVE-2017-5045: Information disclosure in XSS Auditor. Credit to Dhaval
+ Kapil
+ - CVE-2017-5046: Information disclosure in Blink. Credit to Masato Kinugawa
+ * Drop arm and MADV_FREE patches, which are now applied upstream.
+
+ -- Michael Gilbert <mgilbert at debian.org> Fri, 10 Mar 2017 22:00:06 +0000
+
chromium-browser (56.0.2924.76-5) unstable; urgency=medium
* Configure with fieldtrial_testing_like_official_build=true to avoid
diff --git a/debian/copyright b/debian/copyright
index d699c97..f806680 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,6 +25,9 @@ Files-Excluded:
third_party/expat/files
third_party/libxml/src
third_party/*rjsmin/bench
+ third_party/snappy/src/testdata
+ third_party/skia/third_party/yasm
+ third_party/WebKit/PerformanceTests
third_party/mesa/src/src/gallium/state_trackers/d3d1x/w32api
third_party/libxslt/compile
third_party/libxslt/COPYING
diff --git a/debian/patches/disable/google-api-warning.patch b/debian/patches/disable/google-api-warning.patch
index 309ebd3..ed3d053 100644
--- a/debian/patches/disable/google-api-warning.patch
+++ b/debian/patches/disable/google-api-warning.patch
@@ -2,9 +2,9 @@ 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
-@@ -804,8 +804,6 @@ void StartupBrowserCreatorImpl::AddInfoB
- if (is_process_startup == chrome::startup::IS_PROCESS_STARTUP &&
- !command_line_.HasSwitch(switches::kTestType)) {
+@@ -816,8 +816,6 @@ void StartupBrowserCreatorImpl::AddInfoB
+ !command_line_.HasSwitch(switches::kTestType) &&
+ !command_line_.HasSwitch(switches::kEnableAutomation)) {
chrome::ShowBadFlagsPrompt(browser);
- GoogleApiKeysInfoBarDelegate::Create(InfoBarService::FromWebContents(
- browser->tab_strip_model()->GetActiveWebContents()));
diff --git a/debian/patches/disable/third-party-cookies.patch b/debian/patches/disable/third-party-cookies.patch
index 70c5ce2..dfb0ed3 100644
--- a/debian/patches/disable/third-party-cookies.patch
+++ b/debian/patches/disable/third-party-cookies.patch
@@ -3,7 +3,7 @@ author: Chad Miller <chad.miller at 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(
+@@ -101,7 +101,7 @@ void CookieSettings::GetCookieSettings(
void CookieSettings::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
diff --git a/debian/patches/fixes/glibc2.24.patch b/debian/patches/fixes/glibc2.24.patch
deleted file mode 100644
index 980afdd..0000000
--- a/debian/patches/fixes/glibc2.24.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-description: MADV_FREE is newly defined in glibc 2.24, but currently unsupported by webkit, so undefine it
-author: Allan Sandfeld Jensen <allan.jensen at theqtcompany.com>
-origin: http://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?h=49-based&id=b12ffcd411d4776f7120ccecb3be34344d930d2b
-
---- a/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp
-+++ b/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp
-@@ -41,6 +41,10 @@
- #include <errno.h>
- #include <sys/mman.h>
-
-+#if OS(LINUX) && defined(MADV_FREE)
-+#undef MADV_FREE
-+#endif
-+
- #ifndef MADV_FREE
- #define MADV_FREE MADV_DONTNEED
- #endif
diff --git a/debian/patches/fixes/opus-no-neon.patch b/debian/patches/fixes/opus-no-neon.patch
deleted file mode 100644
index b8f33c7..0000000
--- a/debian/patches/fixes/opus-no-neon.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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
-
diff --git a/debian/patches/fixes/ps-print.patch b/debian/patches/fixes/ps-print.patch
index 8f57f16..1b2e281 100644
--- a/debian/patches/fixes/ps-print.patch
+++ b/debian/patches/fixes/ps-print.patch
@@ -3,7 +3,7 @@ author: Salvatore Bonaccorso
--- 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(
+@@ -347,6 +347,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>(
diff --git a/debian/patches/gn/arm64-toolchain.patch b/debian/patches/gn/arm64-toolchain.patch
deleted file mode 100644
index 45c198e..0000000
--- a/debian/patches/gn/arm64-toolchain.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: riku.voipio <riku.voipio at linaro.org>
-Subject: Add gcc toolchain for arm64/linux
- This is needed for Chromium builds in debian/arm64 and matches
- how arm, x86 and x86_64 also have both clang and gcc toolchains available.
-Origin: upstream, https://chromium.googlesource.com/chromium/src.git/+/b9a43ab09791a1dcfd185141f71627c3b8d437db
-
---- a/build/toolchain/linux/BUILD.gn
-+++ b/build/toolchain/linux/BUILD.gn
-@@ -27,6 +27,24 @@ clang_toolchain("clang_arm64") {
- }
- }
-
-+gcc_toolchain("arm64") {
-+ toolprefix = "aarch64-linux-gnu-"
-+
-+ cc = "${toolprefix}gcc"
-+ cxx = "${toolprefix}g++"
-+
-+ ar = "${toolprefix}ar"
-+ ld = cxx
-+ readelf = "${toolprefix}readelf"
-+ nm = "${toolprefix}nm"
-+
-+ toolchain_args = {
-+ current_cpu = "arm64"
-+ current_os = "linux"
-+ is_clang = false
-+ }
-+}
-+
- gcc_toolchain("arm") {
- toolprefix = "arm-linux-gnueabihf-"
-
diff --git a/debian/patches/gn/arm64.patch b/debian/patches/gn/arm64.patch
deleted file mode 100644
index e2b8c34..0000000
--- a/debian/patches/gn/arm64.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: riku.voipio <riku.voipio at linaro.org>
-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
-
---- 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";
- 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")
- arch = kArm;
-+ else if (os_arch == "aarch64")
-+ arch = kArm64;
- else if (os_arch == "mips")
- arch = kMips;
- else if (os_arch == "s390x")
diff --git a/debian/patches/gn/buildflags.patch b/debian/patches/gn/buildflags.patch
index abb2ab0..b7919c4 100644
--- a/debian/patches/gn/buildflags.patch
+++ b/debian/patches/gn/buildflags.patch
@@ -16,7 +16,7 @@ author: Michael Gilbert <mgilbert at debian.org>
clang_toolchain("clang_arm") {
toolprefix = "arm-linux-gnueabihf-"
toolchain_args = {
-@@ -32,6 +38,10 @@ gcc_toolchain("arm") {
+@@ -50,6 +56,10 @@ gcc_toolchain("arm") {
readelf = "${toolprefix}readelf"
nm = "${toolprefix}nm"
@@ -27,7 +27,7 @@ author: Michael Gilbert <mgilbert at debian.org>
toolchain_args = {
current_cpu = "arm"
current_os = "linux"
-@@ -71,6 +81,10 @@ gcc_toolchain("x86") {
+@@ -89,6 +99,10 @@ gcc_toolchain("x86") {
ar = "ar"
ld = cxx
@@ -38,7 +38,7 @@ author: Michael Gilbert <mgilbert at debian.org>
toolchain_args = {
current_cpu = "x86"
current_os = "linux"
-@@ -110,6 +124,10 @@ gcc_toolchain("x64") {
+@@ -128,6 +142,10 @@ gcc_toolchain("x64") {
ar = "ar"
ld = cxx
diff --git a/debian/patches/gn/parallel.patch b/debian/patches/gn/parallel.patch
index 66f4a43..3a30c6e 100644
--- a/debian/patches/gn/parallel.patch
+++ b/debian/patches/gn/parallel.patch
@@ -11,7 +11,7 @@ author: Michael Gilbert <mgilbert at debian.org>
options, args = parser.parse_args(argv)
if args:
-@@ -186,6 +187,8 @@ def build_gn_with_ninja_manually(tempdir
+@@ -189,6 +190,8 @@ def build_gn_with_ninja_manually(tempdir
cmd = ['ninja', '-C', tempdir]
if options.verbose:
cmd.append('-v')
diff --git a/debian/patches/series b/debian/patches/series
index 22ff412..e1b1336 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,20 +4,15 @@ master-preferences.patch
gn/parallel.patch
gn/buildflags.patch
-gn/arm64.patch
-gn/arm64-toolchain.patch
-
disable/promo.patch
disable/google-api-warning.patch
disable/third-party-cookies.patch
disable/external-components.patch
fixes/ps-print.patch
-fixes/glibc2.24.patch
fixes/gpu-timeout.patch
fixes/widevine-revision.patch
fixes/chromedriver-revision.patch
-fixes/opus-no-neon.patch
fixes/arm64-seccomp-memfd.patch
system/icu.patch
diff --git a/debian/patches/system/event.patch b/debian/patches/system/event.patch
index 2d0e243..0ca8622 100644
--- a/debian/patches/system/event.patch
+++ b/debian/patches/system/event.patch
@@ -14,7 +14,7 @@ author: Michael Gilbert <mgilbert at debian.org>
#include "webrtc/base/task_queue_posix.h"
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -543,29 +543,9 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -554,29 +554,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 at debian.org>
ldflags.extend(['-pthread'])
static_libraries['xdg_user_dirs'] = {
-@@ -589,13 +569,6 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -600,13 +580,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 at debian.org>
if is_mac:
static_libraries['base']['sources'].extend([
-@@ -624,12 +597,6 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -635,12 +608,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/threading/platform_thread_mac.mm',
'base/trace_event/malloc_dump_provider.cc',
])
diff --git a/debian/patches/system/ffmpeg.patch b/debian/patches/system/ffmpeg.patch
index 731f0cc..84921f8 100644
--- a/debian/patches/system/ffmpeg.patch
+++ b/debian/patches/system/ffmpeg.patch
@@ -21,7 +21,7 @@ author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
#include <libavutil/imgutils.h>
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -1198,24 +1198,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
+@@ -1195,24 +1195,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);
diff --git a/debian/patches/system/icu.patch b/debian/patches/system/icu.patch
index e41b682..a62a349 100644
--- a/debian/patches/system/icu.patch
+++ b/debian/patches/system/icu.patch
@@ -1,6 +1,6 @@
--- a/BUILD.gn
+++ b/BUILD.gn
-@@ -833,8 +833,7 @@ group("gn_only") {
+@@ -843,8 +843,7 @@ group("gn_only") {
deps += [ "//ui/ozone/demo" ]
}
diff --git a/debian/patches/system/nspr.patch b/debian/patches/system/nspr.patch
index 37b570f..de9024a 100644
--- a/debian/patches/system/nspr.patch
+++ b/debian/patches/system/nspr.patch
@@ -25,7 +25,7 @@ author: Michael Gilbert <mgilbert at debian.org>
namespace base {
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -466,7 +466,6 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -474,7 +474,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 at debian.org>
'base/threading/non_thread_safe_impl.cc',
'base/threading/post_task_and_reply_impl.cc',
'base/threading/sequenced_task_runner_handle.cc',
-@@ -566,7 +565,7 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -577,7 +576,7 @@ def write_gn_ninja(path, root_gen_dir, o
}
if is_linux:
@@ -44,7 +44,7 @@ author: Michael Gilbert <mgilbert at debian.org>
static_libraries['xdg_user_dirs'] = {
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
-@@ -49,6 +49,9 @@ config("base_flags") {
+@@ -58,6 +58,9 @@ config("base_flags") {
"-Wno-char-subscripts",
]
}
@@ -54,12 +54,12 @@ author: Michael Gilbert <mgilbert at debian.org>
}
config("base_implementation") {
-@@ -833,8 +836,6 @@ component("base") {
+@@ -866,8 +869,6 @@ component("base") {
"third_party/dmg_fp/g_fmt.cc",
"third_party/icu/icu_utf.cc",
"third_party/icu/icu_utf.h",
- "third_party/nspr/prtime.cc",
- "third_party/nspr/prtime.h",
"third_party/superfasthash/superfasthash.c",
+ "third_party/valgrind/memcheck.h",
"threading/non_thread_safe.h",
- "threading/non_thread_safe_impl.cc",
diff --git a/debian/patches/system/vpx.patch b/debian/patches/system/vpx.patch
index dce2b7d..be3f2b3 100644
--- a/debian/patches/system/vpx.patch
+++ b/debian/patches/system/vpx.patch
@@ -3,37 +3,17 @@ author: Michael Gilbert <mgilbert at debian.org>
--- a/third_party/webrtc/modules/video_coding/BUILD.gn
+++ b/third_party/webrtc/modules/video_coding/BUILD.gn
-@@ -89,7 +89,6 @@ rtc_static_library("video_coding") {
+@@ -91,7 +91,6 @@ rtc_static_library("video_coding") {
":webrtc_h264",
":webrtc_i420",
":webrtc_vp8",
- ":webrtc_vp9",
"../..:webrtc_common",
- "../../common_video",
- "../../system_wrappers",
---- a/third_party/webrtc/video/video_encoder.cc
-+++ b/third_party/webrtc/video/video_encoder.cc
-@@ -24,8 +24,6 @@ VideoEncoder* VideoEncoder::Create(Video
- return H264Encoder::Create();
- case kVp8:
- return VP8Encoder::Create();
-- case kVp9:
-- return VP9Encoder::Create();
- case kUnsupportedCodec:
- RTC_NOTREACHED();
- return nullptr;
-@@ -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;
+ "../../base:rtc_base",
+ "../../base:rtc_base_approved",
--- a/third_party/webrtc/modules/video_coding/codec_database.cc
+++ b/third_party/webrtc/modules/video_coding/codec_database.cc
-@@ -573,8 +573,6 @@ VCMGenericDecoder* VCMCodecDataBase::Cre
+@@ -574,8 +574,6 @@ VCMGenericDecoder* VCMCodecDataBase::Cre
switch (type) {
case kVideoCodecVP8:
return new VCMGenericDecoder(VP8Decoder::Create());
@@ -42,29 +22,35 @@ author: Michael Gilbert <mgilbert at debian.org>
case kVideoCodecI420:
return new VCMGenericDecoder(new I420Decoder());
case kVideoCodecH264:
---- a/third_party/webrtc/video/video_decoder.cc
-+++ b/third_party/webrtc/video/video_decoder.cc
-@@ -32,9 +32,6 @@ VideoDecoder* VideoDecoder::Create(Video
- return H264Decoder::Create();
- case kVp8:
- return VP8Decoder::Create();
-- case kVp9:
-- RTC_DCHECK(VP9Decoder::IsSupported());
-- return VP9Decoder::Create();
- case kUnsupportedCodec:
+--- a/third_party/webrtc/media/engine/internaldecoderfactory.cc
++++ b/third_party/webrtc/media/engine/internaldecoderfactory.cc
+@@ -73,9 +73,6 @@ webrtc::VideoDecoder* InternalDecoderFac
+ return new NullVideoDecoder();
+ case webrtc::kVideoCodecVP8:
+ return webrtc::VP8Decoder::Create();
+- case webrtc::kVideoCodecVP9:
+- RTC_DCHECK(webrtc::VP9Decoder::IsSupported());
+- return webrtc::VP9Decoder::Create();
+ default:
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(
+--- a/third_party/webrtc/media/engine/internalencoderfactory.cc
++++ b/third_party/webrtc/media/engine/internalencoderfactory.cc
+@@ -31,8 +31,6 @@ bool IsFlexfecFieldTrialEnabled() {
+
+ InternalEncoderFactory::InternalEncoderFactory() {
+ supported_codecs_.push_back(cricket::VideoCodec(kVp8CodecName));
+- if (webrtc::VP9Encoder::IsSupported())
+- supported_codecs_.push_back(cricket::VideoCodec(kVp9CodecName));
+ if (webrtc::H264Encoder::IsSupported()) {
+ cricket::VideoCodec codec(kH264CodecName);
+ // TODO(magjed): Move setting these parameters into webrtc::H264Encoder
+@@ -74,8 +72,6 @@ webrtc::VideoEncoder* InternalEncoderFac
+ return webrtc::H264Encoder::Create(codec);
+ case webrtc::kVideoCodecVP8:
+ return webrtc::VP8Encoder::Create();
+- case webrtc::kVideoCodecVP9:
+- return webrtc::VP9Encoder::Create();
+ default:
+ return nullptr;
+ }
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git
More information about the Pkg-chromium-commit
mailing list