summaryrefslogtreecommitdiffstats
path: root/remoting/host
diff options
context:
space:
mode:
Diffstat (limited to 'remoting/host')
-rw-r--r--remoting/host/chromoting_host.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc
index 4f621c0..ec9be71 100644
--- a/remoting/host/chromoting_host.cc
+++ b/remoting/host/chromoting_host.cc
@@ -8,6 +8,7 @@
#include "base/bind.h"
#include "base/callback.h"
+#include "base/command_line.h"
#include "base/message_loop/message_loop_proxy.h"
#include "build/build_config.h"
#include "jingle/glue/thread_wrapper.h"
@@ -30,6 +31,8 @@ namespace remoting {
namespace {
+const char kEnableVp9SwitchName[] = "enable-vp9";
+
const net::BackoffEntry::Policy kDefaultBackoffPolicy = {
// Number of initial errors (in sequence) to ignore before applying
// exponential back-off rules.
@@ -89,9 +92,11 @@ ChromotingHost::ChromotingHost(
jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop();
- // VP9 encode is not yet supported.
- protocol::CandidateSessionConfig::DisableVideoCodec(
- protocol_config_.get(), protocol::ChannelConfig::CODEC_VP9);
+ // Disable VP9 unless it is explicitly enabled via the command-line.
+ if (!CommandLine::ForCurrentProcess()->HasSwitch(kEnableVp9SwitchName)) {
+ protocol::CandidateSessionConfig::DisableVideoCodec(
+ protocol_config_.get(), protocol::ChannelConfig::CODEC_VP9);
+ }
if (!desktop_environment_factory_->SupportsAudioCapture()) {
protocol::CandidateSessionConfig::DisableAudioChannel(