diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-22 01:53:39 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-22 01:53:39 +0000 |
| commit | 87196ce1202e3fdbaff773b40374995f8a14aca3 (patch) | |
| tree | 71c696306305596a3ae31230dc9628c6fc8a5cbb /remoting/host | |
| parent | 6be0c2a3d8906f07f98a55212633c91c913b0d6f (diff) | |
| download | chromium_src-87196ce1202e3fdbaff773b40374995f8a14aca3.zip chromium_src-87196ce1202e3fdbaff773b40374995f8a14aca3.tar.gz chromium_src-87196ce1202e3fdbaff773b40374995f8a14aca3.tar.bz2 | |
Add VP9 decode support to the remoting client.
BUG=260879
Review URL: https://codereview.chromium.org/26921005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230003 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
| -rw-r--r-- | remoting/host/chromoting_host.cc | 4 | ||||
| -rw-r--r-- | remoting/host/plugin/host_script_object.cc | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc index d7780f1..80cd8b5 100644 --- a/remoting/host/chromoting_host.cc +++ b/remoting/host/chromoting_host.cc @@ -86,6 +86,10 @@ ChromotingHost::ChromotingHost( DCHECK(network_task_runner_->BelongsToCurrentThread()); DCHECK(signal_strategy); + // VP9 encode is not yet supported. + protocol::CandidateSessionConfig::DisableVideoCodec( + protocol_config_.get(), protocol::ChannelConfig::CODEC_VP9); + if (!desktop_environment_factory_->SupportsAudioCapture()) { protocol::CandidateSessionConfig::DisableAudioChannel( protocol_config_.get()); diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc index ddcb1cb..3459bf8 100644 --- a/remoting/host/plugin/host_script_object.cc +++ b/remoting/host/plugin/host_script_object.cc @@ -380,6 +380,11 @@ void HostNPScriptObject::It2MeImpl::FinishConnect() { scoped_ptr<protocol::CandidateSessionConfig> protocol_config = protocol::CandidateSessionConfig::CreateDefault(); protocol::CandidateSessionConfig::DisableAudioChannel(protocol_config.get()); + + // VP9 encode is not yet supported. + protocol::CandidateSessionConfig::DisableVideoCodec( + protocol_config.get(), protocol::ChannelConfig::CODEC_VP9); + host_->set_protocol_config(protocol_config.Pass()); // Create event logger. |