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

Unified Diff: content/browser/gpu/gpu_data_manager_impl_private.cc

Issue 2549283002: Android: enable WebRTC HW H264 with a flag by default (Closed)
Patch Set: Created 4 years 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/gpu/gpu_data_manager_impl_private.cc
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
index 78e7c4b36807678cf0cfe0b35b646731c8b40737..c736f64486887a1b0060e740ec43e1d3eed2176c 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -28,6 +28,7 @@
#include "content/public/browser/gpu_data_manager_observer.h"
#include "content/public/common/content_client.h"
#include "content/public/common/content_constants.h"
+#include "content/public/common/content_features.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/web_preferences.h"
#include "gpu/command_buffer/service/gpu_preferences.h"
@@ -775,7 +776,8 @@ void GpuDataManagerImplPrivate::AppendGpuCommandLine(
#if BUILDFLAG(ENABLE_WEBRTC)
if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) &&
- !command_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) {
+ !command_line->HasSwitch(switches::kDisableWebRtcHWEncoding) &&
+ !base::FeatureList::IsEnabled(features::kWebRtcHWH264EncodingAndroid)) {
if (gpu_preferences) {
gpu_preferences->disable_web_rtc_hw_encoding = true;
} else {

Powered by Google App Engine
This is Rietveld 408576698