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

Side by Side Diff: webrtc/video/video_send_stream.h

Issue 1663413003: Clean up of CongestionController. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Comments addressed. Created 4 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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
(...skipping 15 matching lines...) Expand all
26 26
27 namespace webrtc { 27 namespace webrtc {
28 28
29 class BitrateAllocator; 29 class BitrateAllocator;
30 class CallStats; 30 class CallStats;
31 class CongestionController; 31 class CongestionController;
32 class EncoderStateFeedback; 32 class EncoderStateFeedback;
33 class ProcessThread; 33 class ProcessThread;
34 class ViEChannel; 34 class ViEChannel;
35 class ViEEncoder; 35 class ViEEncoder;
36 class VieRemb;
36 37
37 namespace internal { 38 namespace internal {
38 39
39 class VideoSendStream : public webrtc::VideoSendStream, 40 class VideoSendStream : public webrtc::VideoSendStream,
40 public webrtc::CpuOveruseObserver { 41 public webrtc::CpuOveruseObserver {
41 public: 42 public:
42 VideoSendStream(int num_cpu_cores, 43 VideoSendStream(int num_cpu_cores,
43 ProcessThread* module_process_thread, 44 ProcessThread* module_process_thread,
44 CallStats* call_stats, 45 CallStats* call_stats,
45 CongestionController* congestion_controller, 46 CongestionController* congestion_controller,
47 VieRemb* remb,
46 BitrateAllocator* bitrate_allocator, 48 BitrateAllocator* bitrate_allocator,
47 const VideoSendStream::Config& config, 49 const VideoSendStream::Config& config,
48 const VideoEncoderConfig& encoder_config, 50 const VideoEncoderConfig& encoder_config,
49 const std::map<uint32_t, RtpState>& suspended_ssrcs); 51 const std::map<uint32_t, RtpState>& suspended_ssrcs);
50 52
51 ~VideoSendStream() override; 53 ~VideoSendStream() override;
52 54
53 // webrtc::SendStream implementation. 55 // webrtc::SendStream implementation.
54 void Start() override; 56 void Start() override;
55 void Stop() override; 57 void Stop() override;
(...skipping 22 matching lines...) Expand all
78 SendStatisticsProxy stats_proxy_; 80 SendStatisticsProxy stats_proxy_;
79 TransportAdapter transport_adapter_; 81 TransportAdapter transport_adapter_;
80 EncodedFrameCallbackAdapter encoded_frame_proxy_; 82 EncodedFrameCallbackAdapter encoded_frame_proxy_;
81 const VideoSendStream::Config config_; 83 const VideoSendStream::Config config_;
82 VideoEncoderConfig encoder_config_; 84 VideoEncoderConfig encoder_config_;
83 std::map<uint32_t, RtpState> suspended_ssrcs_; 85 std::map<uint32_t, RtpState> suspended_ssrcs_;
84 86
85 ProcessThread* const module_process_thread_; 87 ProcessThread* const module_process_thread_;
86 CallStats* const call_stats_; 88 CallStats* const call_stats_;
87 CongestionController* const congestion_controller_; 89 CongestionController* const congestion_controller_;
90 VieRemb* const remb_;
88 91
89 rtc::scoped_ptr<VideoCaptureInput> input_; 92 rtc::scoped_ptr<VideoCaptureInput> input_;
90 rtc::scoped_ptr<ViEChannel> vie_channel_; 93 rtc::scoped_ptr<ViEChannel> vie_channel_;
91 rtc::scoped_ptr<ViEEncoder> vie_encoder_; 94 rtc::scoped_ptr<ViEEncoder> vie_encoder_;
92 rtc::scoped_ptr<EncoderStateFeedback> encoder_feedback_; 95 rtc::scoped_ptr<EncoderStateFeedback> encoder_feedback_;
93 96
94 // Used as a workaround to indicate that we should be using the configured 97 // Used as a workaround to indicate that we should be using the configured
95 // start bitrate initially, instead of the one reported by VideoEngine (which 98 // start bitrate initially, instead of the one reported by VideoEngine (which
96 // defaults to too high). 99 // defaults to too high).
97 bool use_config_bitrate_; 100 bool use_config_bitrate_;
98 }; 101 };
99 } // namespace internal 102 } // namespace internal
100 } // namespace webrtc 103 } // namespace webrtc
101 104
102 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ 105 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698