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

Unified Diff: webrtc/video/video_receive_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 side-by-side diff with in-line comments
Download patch
Index: webrtc/video/video_receive_stream.h
diff --git a/webrtc/video/video_receive_stream.h b/webrtc/video/video_receive_stream.h
index 06adb725f7596e84603247083fbbf59c5f49dc81..f86f76d763a22bac4fd6266e347f2217e52b23ec 100644
--- a/webrtc/video/video_receive_stream.h
+++ b/webrtc/video/video_receive_stream.h
@@ -24,13 +24,13 @@
#include "webrtc/video/receive_statistics_proxy.h"
#include "webrtc/video_encoder.h"
#include "webrtc/video_engine/vie_channel.h"
-#include "webrtc/video_engine/vie_channel_group.h"
#include "webrtc/video_engine/vie_encoder.h"
#include "webrtc/video_receive_stream.h"
namespace webrtc {
class CallStats;
+class CongestionController;
class VoiceEngine;
namespace internal {
@@ -41,7 +41,7 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,
public EncodedImageCallback {
public:
VideoReceiveStream(int num_cpu_cores,
- ChannelGroup* channel_group,
+ CongestionController* congestion_controller,
const VideoReceiveStream::Config& config,
webrtc::VoiceEngine* voice_engine,
ProcessThread* process_thread,
@@ -82,7 +82,7 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,
const VideoReceiveStream::Config config_;
Clock* const clock_;
- ChannelGroup* const channel_group_;
+ CongestionController* const congestion_controller_;
CallStats* const call_stats_;
rtc::scoped_ptr<IncomingVideoStream> incoming_video_stream_;

Powered by Google App Engine
This is Rietveld 408576698