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

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

Issue 1419803002: Rename ChannelGroup to CongestionController and move to webrtc/call/. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 5 years, 2 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 10 matching lines...) Expand all
21 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" 21 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
22 #include "webrtc/video/encoded_frame_callback_adapter.h" 22 #include "webrtc/video/encoded_frame_callback_adapter.h"
23 #include "webrtc/video/send_statistics_proxy.h" 23 #include "webrtc/video/send_statistics_proxy.h"
24 #include "webrtc/video/video_capture_input.h" 24 #include "webrtc/video/video_capture_input.h"
25 #include "webrtc/video_receive_stream.h" 25 #include "webrtc/video_receive_stream.h"
26 #include "webrtc/video_send_stream.h" 26 #include "webrtc/video_send_stream.h"
27 27
28 namespace webrtc { 28 namespace webrtc {
29 29
30 class CallStats; 30 class CallStats;
31 class ChannelGroup; 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 36
37 namespace internal { 37 namespace internal {
38 38
39 class VideoSendStream : public webrtc::VideoSendStream, 39 class VideoSendStream : public webrtc::VideoSendStream,
40 public webrtc::CpuOveruseObserver { 40 public webrtc::CpuOveruseObserver {
41 public: 41 public:
42 VideoSendStream(int num_cpu_cores, 42 VideoSendStream(int num_cpu_cores,
43 ProcessThread* module_process_thread, 43 ProcessThread* module_process_thread,
44 CallStats* call_stats, 44 CallStats* call_stats,
45 ChannelGroup* channel_group, 45 CongestionController* congestion_controller,
46 const VideoSendStream::Config& config, 46 const VideoSendStream::Config& config,
47 const VideoEncoderConfig& encoder_config, 47 const VideoEncoderConfig& encoder_config,
48 const std::map<uint32_t, RtpState>& suspended_ssrcs); 48 const std::map<uint32_t, RtpState>& suspended_ssrcs);
49 49
50 ~VideoSendStream() override; 50 ~VideoSendStream() override;
51 51
52 // webrtc::SendStream implementation. 52 // webrtc::SendStream implementation.
53 void Start() override; 53 void Start() override;
54 void Stop() override; 54 void Stop() override;
55 void SignalNetworkState(NetworkState state) override; 55 void SignalNetworkState(NetworkState state) override;
(...skipping 17 matching lines...) Expand all
73 bool SetSendCodec(VideoCodec video_codec); 73 bool SetSendCodec(VideoCodec video_codec);
74 void ConfigureSsrcs(); 74 void ConfigureSsrcs();
75 TransportAdapter transport_adapter_; 75 TransportAdapter transport_adapter_;
76 EncodedFrameCallbackAdapter encoded_frame_proxy_; 76 EncodedFrameCallbackAdapter encoded_frame_proxy_;
77 const VideoSendStream::Config config_; 77 const VideoSendStream::Config config_;
78 VideoEncoderConfig encoder_config_; 78 VideoEncoderConfig encoder_config_;
79 std::map<uint32_t, RtpState> suspended_ssrcs_; 79 std::map<uint32_t, RtpState> suspended_ssrcs_;
80 80
81 ProcessThread* const module_process_thread_; 81 ProcessThread* const module_process_thread_;
82 CallStats* const call_stats_; 82 CallStats* const call_stats_;
83 ChannelGroup* const channel_group_; 83 CongestionController* const congestion_controller_;
84 84
85 rtc::scoped_ptr<VideoCaptureInput> input_; 85 rtc::scoped_ptr<VideoCaptureInput> input_;
86 rtc::scoped_ptr<ViEChannel> vie_channel_; 86 rtc::scoped_ptr<ViEChannel> vie_channel_;
87 rtc::scoped_ptr<ViEEncoder> vie_encoder_; 87 rtc::scoped_ptr<ViEEncoder> vie_encoder_;
88 rtc::scoped_ptr<EncoderStateFeedback> encoder_feedback_; 88 rtc::scoped_ptr<EncoderStateFeedback> encoder_feedback_;
89 89
90 // Used as a workaround to indicate that we should be using the configured 90 // Used as a workaround to indicate that we should be using the configured
91 // start bitrate initially, instead of the one reported by VideoEngine (which 91 // start bitrate initially, instead of the one reported by VideoEngine (which
92 // defaults to too high). 92 // defaults to too high).
93 bool use_config_bitrate_; 93 bool use_config_bitrate_;
94 94
95 SendStatisticsProxy stats_proxy_; 95 SendStatisticsProxy stats_proxy_;
96 }; 96 };
97 } // namespace internal 97 } // namespace internal
98 } // namespace webrtc 98 } // namespace webrtc
99 99
100 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ 100 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698