Index: webrtc/video/video_receive_stream.cc |
diff --git a/webrtc/video/video_receive_stream.cc b/webrtc/video/video_receive_stream.cc |
index 1a4edeb1661eeb99078c7a0e5e2702568de4adcd..d76bbfb838cbfdbea0f4b05707e3af734312953e 100644 |
--- a/webrtc/video/video_receive_stream.cc |
+++ b/webrtc/video/video_receive_stream.cc |
@@ -22,6 +22,7 @@ |
#include "webrtc/common_video/h264/profile_level_id.h" |
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" |
#include "webrtc/modules/congestion_controller/include/congestion_controller.h" |
+#include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h" |
#include "webrtc/modules/utility/include/process_thread.h" |
#include "webrtc/modules/video_coding/frame_object.h" |
#include "webrtc/modules/video_coding/include/video_coding.h" |
@@ -37,16 +38,6 @@ |
namespace webrtc { |
-static bool UseSendSideBwe(const VideoReceiveStream::Config& config) { |
- if (!config.rtp.transport_cc) |
- return false; |
- for (const auto& extension : config.rtp.extensions) { |
- if (extension.uri == RtpExtension::kTransportSequenceNumberUri) |
- return true; |
- } |
- return false; |
-} |
- |
std::string VideoReceiveStream::Decoder::ToString() const { |
std::stringstream ss; |
ss << "{decoder: " << (decoder ? "(VideoDecoder)" : "nullptr"); |
@@ -209,7 +200,9 @@ VideoReceiveStream::VideoReceiveStream( |
rtp_stream_receiver_( |
&video_receiver_, |
congestion_controller_->GetRemoteBitrateEstimator( |
- UseSendSideBwe(config_)), |
+ CongestionController::UseSendSideBwe( |
+ config_.rtp.transport_cc, |
+ RtpHeaderExtensionMap(config_.rtp.extensions))), |
&transport_adapter_, |
call_stats_->rtcp_rtt_stats(), |
congestion_controller_->pacer(), |
@@ -263,7 +256,10 @@ VideoReceiveStream::~VideoReceiveStream() { |
process_thread_->DeRegisterModule(&rtp_stream_sync_); |
process_thread_->DeRegisterModule(&video_receiver_); |
- congestion_controller_->GetRemoteBitrateEstimator(UseSendSideBwe(config_)) |
+ congestion_controller_ |
+ ->GetRemoteBitrateEstimator(CongestionController::UseSendSideBwe( |
+ config_.rtp.transport_cc, |
+ RtpHeaderExtensionMap(config_.rtp.extensions))) |
->RemoveStream(rtp_stream_receiver_.GetRemoteSsrc()); |
} |