diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-22 01:35:34 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-22 01:35:34 +0000 |
| commit | f9274e452a038588d3d940bd26627be3c271df23 (patch) | |
| tree | 4d9444d2744a3a25a7d8af472652393764028c96 /remoting/host/chromoting_host.cc | |
| parent | 275af26aa3867f575b3dcb0be481ae8529517eea (diff) | |
| download | chromium_src-f9274e452a038588d3d940bd26627be3c271df23.zip chromium_src-f9274e452a038588d3d940bd26627be3c271df23.tar.gz chromium_src-f9274e452a038588d3d940bd26627be3c271df23.tar.bz2 | |
Initialize Talk thread pointer during ChromotingHost initialization.
Without this the host will crash as soon as the BasicNetworkManager
is started, i.e. when a client connection is first received, due to
talk_base::Thread::current() being NULL.
BUG=375564
Review URL: https://codereview.chromium.org/289863008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272045 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/chromoting_host.cc')
| -rw-r--r-- | remoting/host/chromoting_host.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc index 469c5b2..4f621c0 100644 --- a/remoting/host/chromoting_host.cc +++ b/remoting/host/chromoting_host.cc @@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/message_loop/message_loop_proxy.h" #include "build/build_config.h" +#include "jingle/glue/thread_wrapper.h" #include "remoting/base/constants.h" #include "remoting/base/logging.h" #include "remoting/host/chromoting_host_context.h" @@ -86,6 +87,8 @@ ChromotingHost::ChromotingHost( DCHECK(network_task_runner_->BelongsToCurrentThread()); DCHECK(signal_strategy); + jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop(); + // VP9 encode is not yet supported. protocol::CandidateSessionConfig::DisableVideoCodec( protocol_config_.get(), protocol::ChannelConfig::CODEC_VP9); |