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/protocol/audio_reader.h" | 5 #include "remoting/protocol/audio_reader.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "net/socket/stream_socket.h" | 8 #include "net/socket/stream_socket.h" |
9 #include "remoting/base/constants.h" | 9 #include "remoting/base/constants.h" |
10 #include "remoting/protocol/session.h" | 10 #include "remoting/protocol/session.h" |
11 #include "remoting/protocol/session_config.h" | 11 #include "remoting/protocol/session_config.h" |
12 | 12 |
13 namespace remoting { | 13 namespace remoting { |
14 namespace protocol { | 14 namespace protocol { |
15 | 15 |
16 AudioReader::AudioReader(AudioPacket::Encoding encoding) | 16 AudioReader::AudioReader(AudioPacket::Encoding encoding) |
17 : session_(NULL), | 17 : session_(NULL), |
18 encoding_(encoding), | 18 encoding_(encoding), |
19 audio_stub_(NULL) { | 19 audio_stub_(NULL) { |
20 } | 20 } |
21 | 21 |
22 AudioReader::~AudioReader() { | 22 AudioReader::~AudioReader() { |
23 if (session_) | 23 if (session_) |
24 session_->CancelChannelCreation(kAudioChannelName); | 24 session_->CancelChannelCreation(kAudioChannelName); |
25 } | 25 } |
26 | 26 |
27 // static | 27 // static |
28 scoped_ptr<AudioReader> AudioReader::Create(const SessionConfig& config) { | 28 scoped_ptr<AudioReader> AudioReader::Create(const SessionConfig& config) { |
| 29 if (!config.is_audio_enabled()) |
| 30 return scoped_ptr<AudioReader>(NULL); |
29 // TODO(kxing): Support different session configurations. | 31 // TODO(kxing): Support different session configurations. |
30 return scoped_ptr<AudioReader>(new AudioReader(AudioPacket::ENCODING_RAW)); | 32 return scoped_ptr<AudioReader>(new AudioReader(AudioPacket::ENCODING_RAW)); |
31 } | 33 } |
32 | 34 |
33 void AudioReader::Init(protocol::Session* session, | 35 void AudioReader::Init(protocol::Session* session, |
34 AudioStub* audio_stub, | 36 AudioStub* audio_stub, |
35 const InitializedCallback& callback) { | 37 const InitializedCallback& callback) { |
36 session_ = session; | 38 session_ = session; |
37 initialized_callback_ = callback; | 39 initialized_callback_ = callback; |
38 audio_stub_ = audio_stub; | 40 audio_stub_ = audio_stub; |
(...skipping 20 matching lines...) Expand all Loading... |
59 initialized_callback_.Run(true); | 61 initialized_callback_.Run(true); |
60 } | 62 } |
61 | 63 |
62 void AudioReader::OnNewData(scoped_ptr<AudioPacket> packet, | 64 void AudioReader::OnNewData(scoped_ptr<AudioPacket> packet, |
63 const base::Closure& done_task) { | 65 const base::Closure& done_task) { |
64 audio_stub_->ProcessAudioPacket(packet.Pass(), done_task); | 66 audio_stub_->ProcessAudioPacket(packet.Pass(), done_task); |
65 } | 67 } |
66 | 68 |
67 } // namespace protocol | 69 } // namespace protocol |
68 } // namespace remoting | 70 } // namespace remoting |
OLD | NEW |