OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "remoting/client/plugin/chromoting_instance.h" | 5 #include "remoting/client/plugin/chromoting_instance.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #if defined(OS_NACL) | 11 #if defined(OS_NACL) |
12 #include <nacl_io/nacl_io.h> | |
Wez
2014/07/31 21:22:53
Did you mean to move this? Does the Chromoting PNa
hellner1
2014/07/31 21:36:27
I ran http://src.chromium.org/viewvc/chrome/trunk/
| |
12 #include <sys/mount.h> | 13 #include <sys/mount.h> |
13 #include <nacl_io/nacl_io.h> | |
14 #endif | 14 #endif |
15 | 15 |
16 #include "base/bind.h" | 16 #include "base/bind.h" |
17 #include "base/callback.h" | 17 #include "base/callback.h" |
18 #include "base/json/json_reader.h" | 18 #include "base/json/json_reader.h" |
19 #include "base/json/json_writer.h" | 19 #include "base/json/json_writer.h" |
20 #include "base/lazy_instance.h" | 20 #include "base/lazy_instance.h" |
21 #include "base/logging.h" | 21 #include "base/logging.h" |
22 #include "base/strings/string_split.h" | 22 #include "base/strings/string_split.h" |
23 #include "base/strings/stringprintf.h" | 23 #include "base/strings/stringprintf.h" |
(...skipping 21 matching lines...) Expand all Loading... | |
45 #include "remoting/client/plugin/normalizing_input_filter_mac.h" | 45 #include "remoting/client/plugin/normalizing_input_filter_mac.h" |
46 #include "remoting/client/plugin/pepper_audio_player.h" | 46 #include "remoting/client/plugin/pepper_audio_player.h" |
47 #include "remoting/client/plugin/pepper_input_handler.h" | 47 #include "remoting/client/plugin/pepper_input_handler.h" |
48 #include "remoting/client/plugin/pepper_port_allocator.h" | 48 #include "remoting/client/plugin/pepper_port_allocator.h" |
49 #include "remoting/client/plugin/pepper_view.h" | 49 #include "remoting/client/plugin/pepper_view.h" |
50 #include "remoting/client/software_video_renderer.h" | 50 #include "remoting/client/software_video_renderer.h" |
51 #include "remoting/client/token_fetcher_proxy.h" | 51 #include "remoting/client/token_fetcher_proxy.h" |
52 #include "remoting/protocol/connection_to_host.h" | 52 #include "remoting/protocol/connection_to_host.h" |
53 #include "remoting/protocol/host_stub.h" | 53 #include "remoting/protocol/host_stub.h" |
54 #include "remoting/protocol/libjingle_transport_factory.h" | 54 #include "remoting/protocol/libjingle_transport_factory.h" |
55 #include "third_party/libjingle/source/talk/base/helpers.h" | 55 #include "third_party/webrtc/base/helpers.h" |
56 #include "third_party/libjingle/source/talk/base/ssladapter.h" | 56 #include "third_party/webrtc/base/ssladapter.h" |
57 #include "url/gurl.h" | 57 #include "url/gurl.h" |
58 | 58 |
59 // Windows defines 'PostMessage', so we have to undef it. | 59 // Windows defines 'PostMessage', so we have to undef it. |
60 #if defined(PostMessage) | 60 #if defined(PostMessage) |
61 #undef PostMessage | 61 #undef PostMessage |
62 #endif | 62 #endif |
63 | 63 |
64 namespace remoting { | 64 namespace remoting { |
65 | 65 |
66 namespace { | 66 namespace { |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
240 RequestInputEvents(PP_INPUTEVENT_CLASS_MOUSE | PP_INPUTEVENT_CLASS_WHEEL); | 240 RequestInputEvents(PP_INPUTEVENT_CLASS_MOUSE | PP_INPUTEVENT_CLASS_WHEEL); |
241 RequestFilteringInputEvents(PP_INPUTEVENT_CLASS_KEYBOARD); | 241 RequestFilteringInputEvents(PP_INPUTEVENT_CLASS_KEYBOARD); |
242 | 242 |
243 // Resister this instance to handle debug log messsages. | 243 // Resister this instance to handle debug log messsages. |
244 RegisterLoggingInstance(); | 244 RegisterLoggingInstance(); |
245 | 245 |
246 #if defined(USE_OPENSSL) | 246 #if defined(USE_OPENSSL) |
247 // Initialize random seed for libjingle. It's necessary only with OpenSSL. | 247 // Initialize random seed for libjingle. It's necessary only with OpenSSL. |
248 char random_seed[kRandomSeedSize]; | 248 char random_seed[kRandomSeedSize]; |
249 crypto::RandBytes(random_seed, sizeof(random_seed)); | 249 crypto::RandBytes(random_seed, sizeof(random_seed)); |
250 talk_base::InitRandom(random_seed, sizeof(random_seed)); | 250 rtc::InitRandom(random_seed, sizeof(random_seed)); |
Wez
2014/07/31 21:22:53
Why rtc and not webrtc?
hellner1
2014/07/31 21:36:27
Discussed here: https://docs.google.com/a/google.c
| |
251 #else | 251 #else |
252 // Libjingle's SSL implementation is not really used, but it has to be | 252 // Libjingle's SSL implementation is not really used, but it has to be |
253 // initialized for NSS builds to make sure that RNG is initialized in NSS, | 253 // initialized for NSS builds to make sure that RNG is initialized in NSS, |
254 // because libjingle uses it. | 254 // because libjingle uses it. |
255 talk_base::InitializeSSL(); | 255 rtc::InitializeSSL(); |
256 #endif // !defined(USE_OPENSSL) | 256 #endif // !defined(USE_OPENSSL) |
257 | 257 |
258 // Send hello message. | 258 // Send hello message. |
259 scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue()); | 259 scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue()); |
260 data->SetInteger("apiVersion", kApiVersion); | 260 data->SetInteger("apiVersion", kApiVersion); |
261 data->SetString("apiFeatures", kApiFeatures); | 261 data->SetString("apiFeatures", kApiFeatures); |
262 data->SetInteger("apiMinVersion", kApiMinMessagingVersion); | 262 data->SetInteger("apiMinVersion", kApiMinMessagingVersion); |
263 data->SetString("requestedCapabilities", kRequestedCapabilities); | 263 data->SetString("requestedCapabilities", kRequestedCapabilities); |
264 data->SetString("supportedCapabilities", kSupportedCapabilities); | 264 data->SetString("supportedCapabilities", kSupportedCapabilities); |
265 | 265 |
(...skipping 966 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1232 void* data_ptr = array_buffer.Map(); | 1232 void* data_ptr = array_buffer.Map(); |
1233 memcpy(data_ptr, buffer, buffer_size); | 1233 memcpy(data_ptr, buffer, buffer_size); |
1234 array_buffer.Unmap(); | 1234 array_buffer.Unmap(); |
1235 pp::VarDictionary data_dictionary; | 1235 pp::VarDictionary data_dictionary; |
1236 data_dictionary.Set(pp::Var("buffer"), array_buffer); | 1236 data_dictionary.Set(pp::Var("buffer"), array_buffer); |
1237 data_dictionary.Set(pp::Var("keyframe"), keyframe); | 1237 data_dictionary.Set(pp::Var("keyframe"), keyframe); |
1238 PostChromotingMessage("mediaSourceData", data_dictionary); | 1238 PostChromotingMessage("mediaSourceData", data_dictionary); |
1239 } | 1239 } |
1240 | 1240 |
1241 } // namespace remoting | 1241 } // namespace remoting |
OLD | NEW |