| 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_RECEIVE_STREAM_H_ | 11 #ifndef WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_ | 
| 12 #define WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_ | 12 #define WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_ | 
| 13 | 13 | 
| 14 #include "webrtc/audio_receive_stream.h" | 14 #include "webrtc/audio_receive_stream.h" | 
| 15 #include "webrtc/audio/scoped_voe_interface.h" |  | 
| 16 #include "webrtc/base/thread_checker.h" |  | 
| 17 #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h" | 15 #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h" | 
| 18 #include "webrtc/voice_engine/include/voe_base.h" |  | 
| 19 | 16 | 
| 20 namespace webrtc { | 17 namespace webrtc { | 
| 21 | 18 | 
| 22 class RemoteBitrateEstimator; | 19 class RemoteBitrateEstimator; | 
| 23 class VoiceEngine; |  | 
| 24 | 20 | 
| 25 namespace internal { | 21 namespace internal { | 
| 26 | 22 | 
| 27 class AudioReceiveStream : public webrtc::AudioReceiveStream { | 23 class AudioReceiveStream : public webrtc::AudioReceiveStream { | 
| 28  public: | 24  public: | 
| 29   AudioReceiveStream(RemoteBitrateEstimator* remote_bitrate_estimator, | 25   AudioReceiveStream(RemoteBitrateEstimator* remote_bitrate_estimator, | 
| 30                      const webrtc::AudioReceiveStream::Config& config, | 26                      const webrtc::AudioReceiveStream::Config& config); | 
| 31                      VoiceEngine* voice_engine); |  | 
| 32   ~AudioReceiveStream() override; | 27   ~AudioReceiveStream() override; | 
| 33 | 28 | 
| 34   // webrtc::ReceiveStream implementation. | 29   // webrtc::ReceiveStream implementation. | 
| 35   void Start() override; | 30   void Start() override; | 
| 36   void Stop() override; | 31   void Stop() override; | 
| 37   void SignalNetworkState(NetworkState state) override; | 32   void SignalNetworkState(NetworkState state) override; | 
| 38   bool DeliverRtcp(const uint8_t* packet, size_t length) override; | 33   bool DeliverRtcp(const uint8_t* packet, size_t length) override; | 
| 39   bool DeliverRtp(const uint8_t* packet, | 34   bool DeliverRtp(const uint8_t* packet, | 
| 40                   size_t length, | 35                   size_t length, | 
| 41                   const PacketTime& packet_time) override; | 36                   const PacketTime& packet_time) override; | 
| 42 | 37 | 
| 43   // webrtc::AudioReceiveStream implementation. | 38   // webrtc::AudioReceiveStream implementation. | 
| 44   webrtc::AudioReceiveStream::Stats GetStats() const override; | 39   webrtc::AudioReceiveStream::Stats GetStats() const override; | 
| 45 | 40 | 
| 46   const webrtc::AudioReceiveStream::Config& config() const; | 41   const webrtc::AudioReceiveStream::Config& config() const; | 
| 47 | 42 | 
| 48  private: | 43  private: | 
| 49   rtc::ThreadChecker thread_checker_; |  | 
| 50   RemoteBitrateEstimator* const remote_bitrate_estimator_; | 44   RemoteBitrateEstimator* const remote_bitrate_estimator_; | 
| 51   const webrtc::AudioReceiveStream::Config config_; | 45   const webrtc::AudioReceiveStream::Config config_; | 
| 52   VoiceEngine* voice_engine_; |  | 
| 53   // We hold one interface pointer to the VoE to make sure it is kept alive. |  | 
| 54   ScopedVoEInterface<VoEBase> voe_base_; |  | 
| 55   rtc::scoped_ptr<RtpHeaderParser> rtp_header_parser_; | 46   rtc::scoped_ptr<RtpHeaderParser> rtp_header_parser_; | 
| 56 }; | 47 }; | 
| 57 }  // namespace internal | 48 }  // namespace internal | 
| 58 }  // namespace webrtc | 49 }  // namespace webrtc | 
| 59 | 50 | 
| 60 #endif  // WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_ | 51 #endif  // WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_ | 
| OLD | NEW | 
|---|