Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Side by Side Diff: webrtc/audio/audio_receive_stream.h

Issue 1535963002: Wire-up BWE feedback for audio receive streams. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Comment addressed. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/audio/audio_receive_stream.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_state.h" 15 #include "webrtc/audio_state.h"
16 #include "webrtc/base/thread_checker.h" 16 #include "webrtc/base/thread_checker.h"
17 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" 17 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
18 18
19 namespace webrtc { 19 namespace webrtc {
20 class CongestionController;
20 class RemoteBitrateEstimator; 21 class RemoteBitrateEstimator;
21 22
22 namespace voe { 23 namespace voe {
23 class ChannelProxy; 24 class ChannelProxy;
24 } // namespace voe 25 } // namespace voe
25 26
26 namespace internal { 27 namespace internal {
27 28
28 class AudioReceiveStream final : public webrtc::AudioReceiveStream { 29 class AudioReceiveStream final : public webrtc::AudioReceiveStream {
29 public: 30 public:
30 AudioReceiveStream(RemoteBitrateEstimator* remote_bitrate_estimator, 31 AudioReceiveStream(CongestionController* congestion_controller,
31 const webrtc::AudioReceiveStream::Config& config, 32 const webrtc::AudioReceiveStream::Config& config,
32 const rtc::scoped_refptr<webrtc::AudioState>& audio_state); 33 const rtc::scoped_refptr<webrtc::AudioState>& audio_state);
33 ~AudioReceiveStream() override; 34 ~AudioReceiveStream() override;
34 35
35 // webrtc::ReceiveStream implementation. 36 // webrtc::ReceiveStream implementation.
36 void Start() override; 37 void Start() override;
37 void Stop() override; 38 void Stop() override;
38 void SignalNetworkState(NetworkState state) override; 39 void SignalNetworkState(NetworkState state) override;
39 bool DeliverRtcp(const uint8_t* packet, size_t length) override; 40 bool DeliverRtcp(const uint8_t* packet, size_t length) override;
40 bool DeliverRtp(const uint8_t* packet, 41 bool DeliverRtp(const uint8_t* packet,
41 size_t length, 42 size_t length,
42 const PacketTime& packet_time) override; 43 const PacketTime& packet_time) override;
43 44
44 // webrtc::AudioReceiveStream implementation. 45 // webrtc::AudioReceiveStream implementation.
45 webrtc::AudioReceiveStream::Stats GetStats() const override; 46 webrtc::AudioReceiveStream::Stats GetStats() const override;
46 47
47 void SetSink(rtc::scoped_ptr<AudioSinkInterface> sink) override; 48 void SetSink(rtc::scoped_ptr<AudioSinkInterface> sink) override;
48 49
49 const webrtc::AudioReceiveStream::Config& config() const; 50 const webrtc::AudioReceiveStream::Config& config() const;
50 51
51 private: 52 private:
52 VoiceEngine* voice_engine() const; 53 VoiceEngine* voice_engine() const;
53 54
54 rtc::ThreadChecker thread_checker_; 55 rtc::ThreadChecker thread_checker_;
55 RemoteBitrateEstimator* const remote_bitrate_estimator_; 56 RemoteBitrateEstimator* remote_bitrate_estimator_ = nullptr;
56 const webrtc::AudioReceiveStream::Config config_; 57 const webrtc::AudioReceiveStream::Config config_;
57 rtc::scoped_refptr<webrtc::AudioState> audio_state_; 58 rtc::scoped_refptr<webrtc::AudioState> audio_state_;
58 rtc::scoped_ptr<RtpHeaderParser> rtp_header_parser_; 59 rtc::scoped_ptr<RtpHeaderParser> rtp_header_parser_;
59 rtc::scoped_ptr<voe::ChannelProxy> channel_proxy_; 60 rtc::scoped_ptr<voe::ChannelProxy> channel_proxy_;
60 61
61 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioReceiveStream); 62 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioReceiveStream);
62 }; 63 };
63 } // namespace internal 64 } // namespace internal
64 } // namespace webrtc 65 } // namespace webrtc
65 66
66 #endif // WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_ 67 #endif // WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/audio/audio_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698