Chromium Code Reviews| 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) | |
|
Sergey Ulanov
2016/10/19 22:04:45
Maybe add a note here that AudioEncoderOpus is not
| |
| 36 return nullptr; | |
| 37 #else | |
| 35 const protocol::ChannelConfig& audio_config = config.audio_config(); | 38 const protocol::ChannelConfig& audio_config = config.audio_config(); |
| 36 | |
| 37 if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) { | 39 if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) { |
| 38 return base::WrapUnique(new AudioEncoderOpus()); | 40 return base::WrapUnique(new AudioEncoderOpus()); |
| 39 } | 41 } |
| 42 #endif | |
| 40 | 43 |
| 41 NOTREACHED(); | 44 NOTREACHED(); |
| 42 return nullptr; | 45 return nullptr; |
| 43 } | 46 } |
| 44 | 47 |
| 45 } // namespace | 48 } // namespace |
| 46 | 49 |
| 47 IceConnectionToClient::IceConnectionToClient( | 50 IceConnectionToClient::IceConnectionToClient( |
| 48 std::unique_ptr<protocol::Session> session, | 51 std::unique_ptr<protocol::Session> session, |
| 49 scoped_refptr<TransportContext> transport_context, | 52 scoped_refptr<TransportContext> transport_context, |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 219 | 222 |
| 220 void IceConnectionToClient::CloseChannels() { | 223 void IceConnectionToClient::CloseChannels() { |
| 221 control_dispatcher_.reset(); | 224 control_dispatcher_.reset(); |
| 222 event_dispatcher_.reset(); | 225 event_dispatcher_.reset(); |
| 223 video_dispatcher_.reset(); | 226 video_dispatcher_.reset(); |
| 224 audio_writer_.reset(); | 227 audio_writer_.reset(); |
| 225 } | 228 } |
| 226 | 229 |
| 227 } // namespace protocol | 230 } // namespace protocol |
| 228 } // namespace remoting | 231 } // namespace remoting |
| OLD | NEW |