| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #ifndef WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_ | 11 #ifndef WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_ |
| 12 #define WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_ | 12 #define WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_ |
| 13 | 13 |
| 14 #include <memory> |
| 15 |
| 14 #include "webrtc/audio_send_stream.h" | 16 #include "webrtc/audio_send_stream.h" |
| 15 #include "webrtc/audio_state.h" | 17 #include "webrtc/audio_state.h" |
| 16 #include "webrtc/base/thread_checker.h" | 18 #include "webrtc/base/thread_checker.h" |
| 17 #include "webrtc/base/scoped_ptr.h" | |
| 18 | 19 |
| 19 namespace webrtc { | 20 namespace webrtc { |
| 20 class CongestionController; | 21 class CongestionController; |
| 21 class VoiceEngine; | 22 class VoiceEngine; |
| 22 | 23 |
| 23 namespace voe { | 24 namespace voe { |
| 24 class ChannelProxy; | 25 class ChannelProxy; |
| 25 } // namespace voe | 26 } // namespace voe |
| 26 | 27 |
| 27 namespace internal { | 28 namespace internal { |
| (...skipping 16 matching lines...) Expand all Loading... |
| 44 webrtc::AudioSendStream::Stats GetStats() const override; | 45 webrtc::AudioSendStream::Stats GetStats() const override; |
| 45 | 46 |
| 46 const webrtc::AudioSendStream::Config& config() const; | 47 const webrtc::AudioSendStream::Config& config() const; |
| 47 | 48 |
| 48 private: | 49 private: |
| 49 VoiceEngine* voice_engine() const; | 50 VoiceEngine* voice_engine() const; |
| 50 | 51 |
| 51 rtc::ThreadChecker thread_checker_; | 52 rtc::ThreadChecker thread_checker_; |
| 52 const webrtc::AudioSendStream::Config config_; | 53 const webrtc::AudioSendStream::Config config_; |
| 53 rtc::scoped_refptr<webrtc::AudioState> audio_state_; | 54 rtc::scoped_refptr<webrtc::AudioState> audio_state_; |
| 54 rtc::scoped_ptr<voe::ChannelProxy> channel_proxy_; | 55 std::unique_ptr<voe::ChannelProxy> channel_proxy_; |
| 55 | 56 |
| 56 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioSendStream); | 57 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioSendStream); |
| 57 }; | 58 }; |
| 58 } // namespace internal | 59 } // namespace internal |
| 59 } // namespace webrtc | 60 } // namespace webrtc |
| 60 | 61 |
| 61 #endif // WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_ | 62 #endif // WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_ |
| OLD | NEW |