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

Unified Diff: webrtc/video/video_receive_stream.cc

Issue 1442003002: Remove BitrateController dependency fromVideoReceiveStream. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « no previous file | webrtc/video_engine/vie_channel.cc » ('j') | webrtc/video_engine/vie_channel.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/video_receive_stream.cc
diff --git a/webrtc/video/video_receive_stream.cc b/webrtc/video/video_receive_stream.cc
index 7986b37bcfb816fae609baed29f2b66fdb6eca9d..287f5355dc9bba1fff41336a55911ccd1bcbac98 100644
--- a/webrtc/video/video_receive_stream.cc
+++ b/webrtc/video/video_receive_stream.cc
@@ -18,7 +18,6 @@
#include "webrtc/base/logging.h"
#include "webrtc/call/congestion_controller.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/video/receive_statistics_proxy.h"
#include "webrtc/video_engine/call_stats.h"
@@ -161,9 +160,7 @@ VideoReceiveStream::VideoReceiveStream(
vie_channel_.reset(new ViEChannel(
num_cpu_cores, &transport_adapter_, process_thread, nullptr,
- congestion_controller_->GetBitrateController()->
- CreateRtcpBandwidthObserver(),
- nullptr, bitrate_estimator, call_stats_->rtcp_rtt_stats(),
+ nullptr, nullptr, bitrate_estimator, call_stats_->rtcp_rtt_stats(),
congestion_controller_->pacer(), congestion_controller_->packet_router(),
1, false));
« no previous file with comments | « no previous file | webrtc/video_engine/vie_channel.cc » ('j') | webrtc/video_engine/vie_channel.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698