Chromium Code Reviews

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

Issue 2752233002: Split CongestionController into send- and receive-side classes. (Closed)
Patch Set: Use variable names receive_side_cc and send_side_cc. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
« no previous file with comments | « no previous file | webrtc/audio/audio_send_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_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> 14 #include <memory>
15 15
16 #include "webrtc/base/constructormagic.h" 16 #include "webrtc/base/constructormagic.h"
17 #include "webrtc/base/thread_checker.h" 17 #include "webrtc/base/thread_checker.h"
18 #include "webrtc/call/audio_send_stream.h" 18 #include "webrtc/call/audio_send_stream.h"
19 #include "webrtc/call/audio_state.h" 19 #include "webrtc/call/audio_state.h"
20 #include "webrtc/call/bitrate_allocator.h" 20 #include "webrtc/call/bitrate_allocator.h"
21 21
22 namespace webrtc { 22 namespace webrtc {
23 class CongestionController; 23 class SendSideCongestionController;
24 class VoiceEngine; 24 class VoiceEngine;
25 class RtcEventLog; 25 class RtcEventLog;
26 class RtcpBandwidthObserver; 26 class RtcpBandwidthObserver;
27 class RtcpRttStats; 27 class RtcpRttStats;
28 class PacketRouter; 28 class PacketRouter;
29 29
30 namespace voe { 30 namespace voe {
31 class ChannelProxy; 31 class ChannelProxy;
32 } // namespace voe 32 } // namespace voe
33 33
34 namespace internal { 34 namespace internal {
35 class AudioSendStream final : public webrtc::AudioSendStream, 35 class AudioSendStream final : public webrtc::AudioSendStream,
36 public webrtc::BitrateAllocatorObserver { 36 public webrtc::BitrateAllocatorObserver {
37 public: 37 public:
38 AudioSendStream(const webrtc::AudioSendStream::Config& config, 38 AudioSendStream(const webrtc::AudioSendStream::Config& config,
39 const rtc::scoped_refptr<webrtc::AudioState>& audio_state, 39 const rtc::scoped_refptr<webrtc::AudioState>& audio_state,
40 rtc::TaskQueue* worker_queue, 40 rtc::TaskQueue* worker_queue,
41 PacketRouter* packet_router, 41 PacketRouter* packet_router,
42 CongestionController* congestion_controller, 42 SendSideCongestionController* send_side_cc,
43 BitrateAllocator* bitrate_allocator, 43 BitrateAllocator* bitrate_allocator,
44 RtcEventLog* event_log, 44 RtcEventLog* event_log,
45 RtcpRttStats* rtcp_rtt_stats); 45 RtcpRttStats* rtcp_rtt_stats);
46 ~AudioSendStream() override; 46 ~AudioSendStream() override;
47 47
48 // webrtc::AudioSendStream implementation. 48 // webrtc::AudioSendStream implementation.
49 void Start() override; 49 void Start() override;
50 void Stop() override; 50 void Stop() override;
51 bool SendTelephoneEvent(int payload_type, int payload_frequency, int event, 51 bool SendTelephoneEvent(int payload_type, int payload_frequency, int event,
52 int duration_ms) override; 52 int duration_ms) override;
(...skipping 17 matching lines...)
70 70
71 bool SetupSendCodec(); 71 bool SetupSendCodec();
72 72
73 rtc::ThreadChecker thread_checker_; 73 rtc::ThreadChecker thread_checker_;
74 rtc::TaskQueue* worker_queue_; 74 rtc::TaskQueue* worker_queue_;
75 const webrtc::AudioSendStream::Config config_; 75 const webrtc::AudioSendStream::Config config_;
76 rtc::scoped_refptr<webrtc::AudioState> audio_state_; 76 rtc::scoped_refptr<webrtc::AudioState> audio_state_;
77 std::unique_ptr<voe::ChannelProxy> channel_proxy_; 77 std::unique_ptr<voe::ChannelProxy> channel_proxy_;
78 78
79 BitrateAllocator* const bitrate_allocator_; 79 BitrateAllocator* const bitrate_allocator_;
80 CongestionController* const congestion_controller_; 80 SendSideCongestionController* const send_side_cc_;
81 std::unique_ptr<RtcpBandwidthObserver> bandwidth_observer_; 81 std::unique_ptr<RtcpBandwidthObserver> bandwidth_observer_;
82 82
83 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioSendStream); 83 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioSendStream);
84 }; 84 };
85 } // namespace internal 85 } // namespace internal
86 } // namespace webrtc 86 } // namespace webrtc
87 87
88 #endif // WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_ 88 #endif // WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/audio/audio_send_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine