Commit 3d335eef authored by Michael Gilbert's avatar Michael Gilbert

release 59.0.3071.47-1

parent ed0d87e6
chromium-browser (59.0.3071.47-1) experimental; urgency=medium
* New upstream beta release.
* Simplify approach for disabling vp9.
* Fix incomplete new interfaces to system ICU library.
* Remove XML_PARSE_NOXXE flag since system libxml2 does not yet support it.
-- Michael Gilbert <mgilbert@debian.org> Sat, 13 May 2017 16:09:05 +0000
chromium-browser (58.0.3029.96-1) unstable; urgency=medium
* New upstream security release.
- CVE-2017-5068: Race condition in WebRTC. Credit to Philipp Hancke
-- Michael Gilbert <mgilbert@debian.org> Sun, 07 May 2017 00:36:22 +0000
chromium-browser (58.0.3029.81-1) unstable; urgency=medium
* New upstream stable release.
......
......@@ -9,6 +9,7 @@ third_party/flac/BUILD.gn
third_party/harfbuzz-ng/BUILD.gn
base/third_party/libevent/BUILD.gn
build/secondary/third_party/libjpeg_turbo/BUILD.gn
third_party/libdrm/BUILD.gn
third_party/libpng/BUILD.gn
third_party/libvpx/BUILD.gn
third_party/libwebp/BUILD.gn
......
author: Michael Gilbert <mgilbert@debian.org>
description: disable loading external components
--- a/chrome/browser/extensions/external_component_loader.cc
+++ b/chrome/browser/extensions/external_component_loader.cc
@@ -41,6 +41,9 @@ ExternalComponentLoader::~ExternalCompon
@@ -41,21 +41,6 @@ ExternalComponentLoader::~ExternalCompon
void ExternalComponentLoader::StartLoading() {
prefs_.reset(new base::DictionaryValue());
+ LoadFinished();
+ return;
+
AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId);
-#if defined(GOOGLE_CHROME_BUILD)
- AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId);
-#endif // defined(GOOGLE_CHROME_BUILD)
-
- if (HotwordServiceFactory::IsHotwordAllowed(profile_))
- AddExternalExtension(extension_misc::kHotwordSharedModuleId);
-
-#if defined(OS_CHROMEOS)
- {
- base::CommandLine* const command_line =
- base::CommandLine::ForCurrentProcess();
- if (!command_line->HasSwitch(chromeos::switches::kDisableNewZIPUnpacker))
- AddExternalExtension(extension_misc::kZIPUnpackerExtensionId);
- }
-#endif
#if defined(ENABLE_MEDIA_ROUTER)
if (media_router::MediaRouterEnabled(profile_) &&
@@ -64,12 +49,6 @@ void ExternalComponentLoader::StartLoadi
}
#endif // defined(ENABLE_MEDIA_ROUTER)
-#if BUILDFLAG(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
- std::string google_now_extension_id;
- if (GetGoogleNowExtensionId(&google_now_extension_id))
- AddExternalExtension(google_now_extension_id);
-#endif
-
LoadFinished();
}
if (HotwordServiceFactory::IsHotwordAllowed(profile_))
......@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/634101
--- a/chrome/browser/ui/app_list/app_list_service.cc
+++ b/chrome/browser/ui/app_list/app_list_service.cc
@@ -155,7 +155,7 @@ void AppListService::RegisterPrefs(PrefR
@@ -145,7 +145,7 @@ void AppListService::RegisterPrefs(PrefR
// Identifies whether we should show the app launcher promo or not. This
// becomes false when the user dismisses the promo.
......
description: dma-buf.h is not provided by linux-libc-dev until version 4.11 in debian
author: Michael Gilbert <mgilbert@debian.org>
--- a/ui/gfx/linux/client_native_pixmap_dmabuf.cc
+++ b/ui/gfx/linux/client_native_pixmap_dmabuf.cc
@@ -17,7 +17,7 @@
#include "base/strings/stringprintf.h"
#include "base/trace_event/trace_event.h"
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
#include <linux/types.h>
struct local_dma_buf_sync {
......@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/781940
--- a/gpu/ipc/service/gpu_watchdog_thread.cc
+++ b/gpu/ipc/service/gpu_watchdog_thread.cc
@@ -36,7 +36,7 @@ const int kGpuTimeout = 30000;
@@ -41,7 +41,7 @@ const int kGpuTimeout = 30000;
// infected machines.
const int kGpuTimeout = 15000;
#else
......
......@@ -27,9 +27,9 @@ author: Michael Gilbert <mgilbert@debian.org>
toolchain_args = {
current_cpu = "arm"
current_os = "linux"
@@ -89,6 +99,10 @@ gcc_toolchain("x86") {
ar = "ar"
ld = cxx
@@ -95,6 +105,10 @@ gcc_toolchain("x86") {
# Output linker map files for binary size analysis.
enable_linker_map = true
+ extra_cflags = target_extra_cflags
+ extra_ldflags = target_extra_ldflags
......@@ -38,9 +38,9 @@ author: Michael Gilbert <mgilbert@debian.org>
toolchain_args = {
current_cpu = "x86"
current_os = "linux"
@@ -128,6 +142,10 @@ gcc_toolchain("x64") {
ar = "ar"
ld = cxx
@@ -140,6 +154,10 @@ gcc_toolchain("x64") {
# Output linker map files for binary size analysis.
enable_linker_map = true
+ extra_cflags = target_extra_cflags
+ extra_ldflags = target_extra_ldflags
......
description: add a file now required by gn
author: Michael Gilbert <mgilbert@debian.org>
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -384,6 +384,7 @@ def write_gn_ninja(path, root_gen_dir, o
'base/base_paths.cc',
'base/base_switches.cc',
'base/build_time.cc',
+ 'base/callback_helpers.cc',
'base/callback_internal.cc',
'base/command_line.cc',
'base/debug/activity_tracker.cc',
......@@ -11,7 +11,7 @@ author: Michael Gilbert <mgilbert@debian.org>
options, args = parser.parse_args(argv)
if args:
@@ -198,6 +199,8 @@ def build_gn_with_ninja_manually(tempdir
@@ -199,6 +200,8 @@ def build_gn_with_ninja_manually(tempdir
cmd = ['ninja', '-C', tempdir]
if options.verbose:
cmd.append('-v')
......
description: search for master_preferences in /usr/share/chromium
author: Michael Gilbert <mgilbert@debian.org>
--- a/chrome/browser/first_run/first_run_internal_linux.cc
+++ b/chrome/browser/first_run/first_run_internal_linux.cc
......
manpage.patch
master-preferences.patch
gn/callback.patch
gn/parallel.patch
gn/buildflags.patch
......@@ -10,6 +9,7 @@ disable/google-api-warning.patch
disable/third-party-cookies.patch
disable/external-components.patch
fixes/dma.patch
fixes/ps-print.patch
fixes/gpu-timeout.patch
fixes/widevine-revision.patch
......@@ -19,4 +19,5 @@ system/icu.patch
system/vpx.patch
system/nspr.patch
system/event.patch
system/libxml.patch
system/ffmpeg.patch
......@@ -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
@@ -573,29 +573,9 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -578,29 +578,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'] = {
@@ -620,13 +600,6 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -627,13 +607,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([
@@ -655,12 +628,6 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -663,12 +636,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/threading/platform_thread_mac.mm',
'base/trace_event/malloc_dump_provider.cc',
])
......
......@@ -3,7 +3,7 @@ author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
--- a/media/ffmpeg/ffmpeg_common.h
+++ b/media/ffmpeg/ffmpeg_common.h
@@ -25,7 +25,6 @@ extern "C" {
@@ -26,7 +26,6 @@ extern "C" {
// Disable deprecated features which result in spammy compile warnings. This
// list of defines must mirror those in the 'defines' section of FFmpeg's
// BUILD.gn file or the headers below will generate different structures!
......@@ -11,7 +11,7 @@ author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
// Upstream libavcodec/utils.c still uses the deprecated
// av_dup_packet(), causing deprecation warnings.
// The normal fix for such things is to disable the feature as below,
@@ -39,7 +38,6 @@ extern "C" {
@@ -40,7 +39,6 @@ extern "C" {
MSVC_PUSH_DISABLE_WARNING(4244);
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
......@@ -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
@@ -1221,24 +1221,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
@@ -1223,29 +1223,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);
......@@ -37,8 +37,13 @@ author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
- if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
- const base::TimeDelta packet_pts =
- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
- if (packet_pts < start_time_estimates[stream->index])
- // We ignore kNoTimestamp here since -int64_t::min() is possible; see
- // https://crbug.com/700501. Technically this is a valid value, but in
- // practice shouldn't occur, so just ignore it when estimating.
- if (packet_pts != kNoTimestamp && packet_pts != kInfiniteDuration &&
- packet_pts < start_time_estimates[stream->index]) {
- start_time_estimates[stream->index] = packet_pts;
- }
- }
- packet_buffer = packet_buffer->next;
- }
......
description: maintain compatibility with system icu library
author: Michael Gilbert <mgilbert@debian.org>
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -811,8 +811,7 @@ group("gn_only") {
@@ -676,8 +676,7 @@ group("gn_all") {
deps += [ "//ui/ozone/demo" ]
}
......@@ -10,3 +13,196 @@
deps += [
"//testing/libfuzzer/fuzzers",
"//testing/libfuzzer/tests:libfuzzer_tests",
--- a/third_party/WebKit/Source/platform/wtf/text/TextCodecICU.cpp
+++ b/third_party/WebKit/Source/platform/wtf/text/TextCodecICU.cpp
@@ -71,8 +71,8 @@ void TextCodecICU::RegisterEncodingNames
const char* primary_standard = "HTML";
const char* secondary_standard = "MIME";
#else
- const char* primaryStandard = "MIME";
- const char* secondaryStandard = "IANA";
+ const char* primary_standard = "MIME";
+ const char* secondary_standard = "IANA";
#endif
const char* standard_name =
ucnv_getStandardName(name, primary_standard, &error);
@@ -94,20 +94,20 @@ void TextCodecICU::RegisterEncodingNames
// encoding for encoding GB_2312-80 and several others. So, we need to
// override this behavior, too.
#if defined(USING_SYSTEM_ICU)
- if (!strcmp(standardName, "GB2312") || !strcmp(standardName, "GB_2312-80"))
- standardName = "GBK";
+ if (!strcmp(standard_name, "GB2312") || !strcmp(standard_name, "GB_2312-80"))
+ standard_name = "GBK";
// Similarly, EUC-KR encodings all map to an extended version, but
// per HTML5, the canonical name still should be EUC-KR.
- else if (!strcmp(standardName, "EUC-KR") ||
- !strcmp(standardName, "KSC_5601") ||
- !strcmp(standardName, "cp1363"))
- standardName = "EUC-KR";
+ else if (!strcmp(standard_name, "EUC-KR") ||
+ !strcmp(standard_name, "KSC_5601") ||
+ !strcmp(standard_name, "cp1363"))
+ standard_name = "EUC-KR";
// And so on.
- else if (!strcasecmp(standardName, "iso-8859-9"))
+ else if (!strcasecmp(standard_name, "iso-8859-9"))
// This name is returned in different case by ICU 3.2 and 3.6.
- standardName = "windows-1254";
- else if (!strcmp(standardName, "TIS-620"))
- standardName = "windows-874";
+ standard_name = "windows-1254";
+ else if (!strcmp(standard_name, "TIS-620"))
+ standard_name = "windows-874";
#endif
registrar(standard_name, standard_name);
@@ -272,7 +272,7 @@ void TextCodecICU::CreateICUConverter()
DCHECK(!converter_icu_);
#if defined(USING_SYSTEM_ICU)
- const char* name = m_encoding.name();
+ const char* name = encoding_.GetName();
m_needsGBKFallbacks =
name[0] == 'G' && name[1] == 'B' && name[2] == 'K' && !name[3];
#endif
@@ -393,16 +393,16 @@ String TextCodecICU::Decode(const char*
// Chrome's copy of ICU does not have the issue described below.
return result.ToString();
#else
- String resultString = result.toString();
+ String resultString = result.ToString();
// <http://bugs.webkit.org/show_bug.cgi?id=17014>
// Simplified Chinese pages use the code A3A0 to mean "full-width space", but
// ICU decodes it as U+E5E5.
- if (!strcmp(m_encoding.name(), "GBK")) {
- if (!strcasecmp(m_encoding.name(), "gb18030"))
- resultString.replace(0xE5E5, ideographicSpaceCharacter);
+ if (!strcmp(encoding_.GetName(), "GBK")) {
+ if (!strcasecmp(encoding_.GetName(), "gb18030"))
+ resultString.Replace(0xE5E5, ideographicSpaceCharacter);
// Make GBK compliant to the encoding spec and align with GB18030
- resultString.replace(0x01F9, 0xE7C8);
+ resultString.Replace(0x01F9, 0xE7C8);
// FIXME: Once https://www.w3.org/Bugs/Public/show_bug.cgi?id=28740#c3
// is resolved, add U+1E3F => 0xE7C7.
}
@@ -506,7 +506,7 @@ static void gbkCallbackEscape(const void
ucnv_cbFromUWriteUChars(fromUArgs, &source, source + 1, 0, err);
return;
}
- numericEntityCallback(context, fromUArgs, codeUnits, length, codePoint,
+ NumericEntityCallback(context, fromUArgs, codeUnits, length, codePoint,
reason, err);
}
@@ -525,7 +525,7 @@ static void gbkCssEscapedEntityCallack(c
ucnv_cbFromUWriteUChars(fromUArgs, &source, source + 1, 0, err);
return;
}
- cssEscapedEntityCallback(context, fromUArgs, codeUnits, length, codePoint,
+ CssEscapedEntityCallback(context, fromUArgs, codeUnits, length, codePoint,
reason, err);
return;
}
@@ -548,7 +548,7 @@ static void gbkUrlEscapedEntityCallack(c
ucnv_cbFromUWriteUChars(fromUArgs, &source, source + 1, 0, err);
return;
}
- urlEscapedEntityCallback(context, fromUArgs, codeUnits, length, codePoint,
+ UrlEscapedEntityCallback(context, fromUArgs, codeUnits, length, codePoint,
reason, err);
return;
}
@@ -622,7 +622,7 @@ CString TextCodecICU::EncodeInternal(con
0, 0, &err);
#else
ucnv_setFromUCallBack(
- m_converterICU, m_needsGBKFallbacks ? gbkCallbackSubstitute
+ converter_icu_, m_needsGBKFallbacks ? gbkCallbackSubstitute
: UCNV_FROM_U_CALLBACK_SUBSTITUTE,
0, 0, 0, &err);
#endif
@@ -633,8 +633,8 @@ CString TextCodecICU::EncodeInternal(con
&err);
#else
ucnv_setFromUCallBack(
- m_converterICU,
- m_needsGBKFallbacks ? gbkCallbackEscape : numericEntityCallback, 0, 0,
+ converter_icu_,
+ m_needsGBKFallbacks ? gbkCallbackEscape : NumericEntityCallback, 0, 0,
0, &err);
#endif
break;
@@ -643,9 +643,9 @@ CString TextCodecICU::EncodeInternal(con
ucnv_setFromUCallBack(converter_icu_, UrlEscapedEntityCallback, 0, 0, 0,
&err);
#else
- ucnv_setFromUCallBack(m_converterICU,
+ ucnv_setFromUCallBack(converter_icu_,
m_needsGBKFallbacks ? gbkUrlEscapedEntityCallack
- : urlEscapedEntityCallback,
+ : UrlEscapedEntityCallback,
0, 0, 0, &err);
#endif
break;
@@ -654,9 +654,9 @@ CString TextCodecICU::EncodeInternal(con
ucnv_setFromUCallBack(converter_icu_, CssEscapedEntityCallback, 0, 0, 0,
&err);
#else
- ucnv_setFromUCallBack(m_converterICU,
+ ucnv_setFromUCallBack(converter_icu_,
m_needsGBKFallbacks ? gbkCssEscapedEntityCallack
- : cssEscapedEntityCallback,
+ : CssEscapedEntityCallback,
0, 0, 0, &err);
#endif
break;
--- a/third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp
+++ b/third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp
@@ -20,7 +20,7 @@
namespace blink {
#if defined(USING_SYSTEM_ICU)
-static void generate(FILE*) {}
+static void Generate(FILE*) {}
#else
const UChar32 kMaxCodepoint = 0x10FFFF;
--- a/third_party/WebKit/Source/platform/text/CharacterEmoji.cpp
+++ b/third_party/WebKit/Source/platform/text/CharacterEmoji.cpp
@@ -192,26 +192,26 @@ static void applyPatternAndFreeze(icu::U
DCHECK_EQ(err, U_ZERO_ERROR);
}
-bool Character::isEmoji(UChar32 ch) {
- return Character::isEmojiTextDefault(ch) ||
- Character::isEmojiEmojiDefault(ch);
+bool Character::IsEmoji(UChar32 ch) {
+ return Character::IsEmojiTextDefault(ch) ||
+ Character::IsEmojiEmojiDefault(ch);
}
-bool Character::isEmojiTextDefault(UChar32 ch) {
+bool Character::IsEmojiTextDefault(UChar32 ch) {
DEFINE_STATIC_LOCAL(icu::UnicodeSet, emojiTextSet, ());
if (emojiTextSet.isEmpty())
applyPatternAndFreeze(&emojiTextSet, kEmojiTextPattern);
- return emojiTextSet.contains(ch) && !isEmojiEmojiDefault(ch);
+ return emojiTextSet.contains(ch) && !IsEmojiEmojiDefault(ch);
}
-bool Character::isEmojiEmojiDefault(UChar32 ch) {
+bool Character::IsEmojiEmojiDefault(UChar32 ch) {
DEFINE_STATIC_LOCAL(icu::UnicodeSet, emojiEmojiSet, ());
if (emojiEmojiSet.isEmpty())
applyPatternAndFreeze(&emojiEmojiSet, kEmojiEmojiPattern);
return emojiEmojiSet.contains(ch);
}
-bool Character::isEmojiModifierBase(UChar32 ch) {
+bool Character::IsEmojiModifierBase(UChar32 ch) {
DEFINE_STATIC_LOCAL(icu::UnicodeSet, emojieModifierBaseSet, ());
if (emojieModifierBaseSet.isEmpty())
applyPatternAndFreeze(&emojieModifierBaseSet, kEmojiModifierBasePattern);
description: system libxml2 2.9.4 does not yet provide XML_PARSE_NOXXE
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/libxml/chromium/libxml_utils.cc
+++ b/third_party/libxml/chromium/libxml_utils.cc
@@ -24,8 +24,7 @@ XmlReader::~XmlReader() {
bool XmlReader::Load(const std::string& input) {
const int kParseOptions = XML_PARSE_RECOVER | // recover on errors
- XML_PARSE_NONET | // forbid network access
- XML_PARSE_NOXXE; // no external entities
+ XML_PARSE_NONET; // forbid network access
// TODO(evanm): Verify it's OK to pass NULL for the URL and encoding.
// The libxml code allows for these, but it's unclear what effect is has.
reader_ = xmlReaderForMemory(input.data(), static_cast<int>(input.size()),
@@ -35,8 +34,7 @@ bool XmlReader::Load(const std::string&
bool XmlReader::LoadFile(const std::string& file_path) {
const int kParseOptions = XML_PARSE_RECOVER | // recover on errors
- XML_PARSE_NONET | // forbid network access
- XML_PARSE_NOXXE; // no external entities
+ XML_PARSE_NONET; // forbid network access
reader_ = xmlReaderForFile(file_path.c_str(), NULL, kParseOptions);
return reader_ != NULL;
}
......@@ -25,7 +25,7 @@ author: Michael Gilbert <mgilbert@debian.org>
namespace base {
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -490,7 +490,6 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -492,7 +492,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',
@@ -596,7 +595,7 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -601,7 +600,7 @@ def write_gn_ninja(path, root_gen_dir, o
}
if is_linux:
......@@ -54,7 +54,7 @@ author: Michael Gilbert <mgilbert@debian.org>
}
config("base_implementation") {
@@ -884,8 +887,6 @@ component("base") {
@@ -861,8 +864,6 @@ component("base") {
"third_party/dmg_fp/g_fmt.cc",
"third_party/icu/icu_utf.cc",
"third_party/icu/icu_utf.h",
......
description: system vpx doesn't yet support vp9 interface used by webrtc
description: maintain compatibility with system vpx
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/webrtc/modules/video_coding/BUILD.gn
+++ b/third_party/webrtc/modules/video_coding/BUILD.gn
@@ -91,7 +91,6 @@ rtc_static_library("video_coding") {
":webrtc_h264",
":webrtc_i420",
":webrtc_vp8",
- ":webrtc_vp9",
"../..:webrtc_common",
"../../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
@@ -574,8 +574,6 @@ VCMGenericDecoder* VCMCodecDataBase::Cre
switch (type) {
case kVideoCodecVP8:
return new VCMGenericDecoder(VP8Decoder::Create());
- case kVideoCodecVP9:
- return new VCMGenericDecoder(VP9Decoder::Create());
case kVideoCodecI420:
return new VCMGenericDecoder(new I420Decoder());
case kVideoCodecH264:
--- 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/internalencoderfactory.cc
+++ b/third_party/webrtc/media/engine/internalencoderfactory.cc
@@ -34,8 +34,6 @@ bool IsFlexfecAdvertisedFieldTrialEnable
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
@@ -77,8 +75,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;
}
--- a/third_party/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
+++ b/third_party/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
@@ -1146,9 +1146,6 @@ int VP8DecoderImpl::Decode(const Encoded
@@ -1077,9 +1077,6 @@ int VP8DecoderImpl::Decode(const Encoded
img = vpx_codec_get_frame(decoder_, &iter);
int qp;
......@@ -66,7 +13,7 @@ author: Michael Gilbert <mgilbert@debian.org>
ret = ReturnFrame(img, input_image._timeStamp, input_image.ntp_time_ms_, qp);
if (ret != 0) {
// Reset to avoid requesting key frames too often.
@@ -1237,8 +1234,9 @@ int VP8DecoderImpl::ReturnFrame(const vp
@@ -1126,8 +1123,9 @@ int VP8DecoderImpl::ReturnFrame(const vp
VideoFrame decoded_image(buffer, timestamp, 0, kVideoRotation_0);
decoded_image.set_ntp_time_ms(ntp_time_ms);
......@@ -76,5 +23,5 @@ author: Michael Gilbert <mgilbert@debian.org>
+ if (ret != 0)
+ return ret;
// Remember image format for later
image_format_ = img->fmt;
return WEBRTC_VIDEO_CODEC_OK;
}
......@@ -40,6 +40,7 @@ defines+=is_debug=false \
use_sysroot=false \
use_vulcanize=false \
use_gnome_keyring=false \
rtc_libvpx_build_vp9=false \
treat_warnings_as_errors=false \
enable_nacl=false \
enable_nacl_nonsfi=false \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment