OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/protocol/ice_connection_to_client.h" | 5 #include "remoting/protocol/ice_connection_to_client.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/location.h" | 10 #include "base/location.h" |
(...skipping 14 matching lines...) Expand all Loading... |
25 #include "remoting/protocol/transport_context.h" | 25 #include "remoting/protocol/transport_context.h" |
26 #include "remoting/protocol/video_frame_pump.h" | 26 #include "remoting/protocol/video_frame_pump.h" |
27 | 27 |
28 namespace remoting { | 28 namespace remoting { |
29 namespace protocol { | 29 namespace protocol { |
30 | 30 |
31 namespace { | 31 namespace { |
32 | 32 |
33 std::unique_ptr<AudioEncoder> CreateAudioEncoder( | 33 std::unique_ptr<AudioEncoder> CreateAudioEncoder( |
34 const protocol::SessionConfig& config) { | 34 const protocol::SessionConfig& config) { |
| 35 #if defined(OS_IOS) |
| 36 // TODO(nicholss): iOS should not use Opus. This is to prevent us from |
| 37 // depending on //media. In the future we will use webrtc for conneciton |
| 38 // and this will be a non-issue. |
| 39 return nullptr; |
| 40 #else |
35 const protocol::ChannelConfig& audio_config = config.audio_config(); | 41 const protocol::ChannelConfig& audio_config = config.audio_config(); |
36 | |
37 if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) { | 42 if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) { |
38 return base::WrapUnique(new AudioEncoderOpus()); | 43 return base::WrapUnique(new AudioEncoderOpus()); |
39 } | 44 } |
| 45 #endif |
40 | 46 |
41 NOTREACHED(); | 47 NOTREACHED(); |
42 return nullptr; | 48 return nullptr; |
43 } | 49 } |
44 | 50 |
45 } // namespace | 51 } // namespace |
46 | 52 |
47 IceConnectionToClient::IceConnectionToClient( | 53 IceConnectionToClient::IceConnectionToClient( |
48 std::unique_ptr<protocol::Session> session, | 54 std::unique_ptr<protocol::Session> session, |
49 scoped_refptr<TransportContext> transport_context, | 55 scoped_refptr<TransportContext> transport_context, |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 | 225 |
220 void IceConnectionToClient::CloseChannels() { | 226 void IceConnectionToClient::CloseChannels() { |
221 control_dispatcher_.reset(); | 227 control_dispatcher_.reset(); |
222 event_dispatcher_.reset(); | 228 event_dispatcher_.reset(); |
223 video_dispatcher_.reset(); | 229 video_dispatcher_.reset(); |
224 audio_writer_.reset(); | 230 audio_writer_.reset(); |
225 } | 231 } |
226 | 232 |
227 } // namespace protocol | 233 } // namespace protocol |
228 } // namespace remoting | 234 } // namespace remoting |
OLD | NEW |