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

Unified Diff: webrtc/video/video_receive_stream.cc

Issue 3006063002: Reland of Use RtxReceiveStream. (Closed)
Patch Set: Address comments. Created 3 years, 3 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
« no previous file with comments | « webrtc/video/video_receive_stream.h ('k') | no next file » | no next file with comments »
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 74c90134b933d1f217fda6d81fca259c14659e03..a89e3ce36649d5421dde69b41bcaf6e589cd80cb 100644
--- a/webrtc/video/video_receive_stream.cc
+++ b/webrtc/video/video_receive_stream.cc
@@ -18,6 +18,7 @@
#include "webrtc/api/optional.h"
#include "webrtc/call/rtp_stream_receiver_controller_interface.h"
+#include "webrtc/call/rtx_receive_stream.h"
#include "webrtc/common_types.h"
#include "webrtc/common_video/h264/profile_level_id.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
@@ -32,6 +33,7 @@
#include "webrtc/rtc_base/checks.h"
#include "webrtc/rtc_base/location.h"
#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/ptr_util.h"
#include "webrtc/rtc_base/trace_event.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/system_wrappers/include/field_trial.h"
@@ -88,6 +90,7 @@ VideoReceiveStream::VideoReceiveStream(
"DecodingThread",
rtc::kHighestPriority),
call_stats_(call_stats),
+ rtp_receive_statistics_(ReceiveStatistics::Create(clock_)),
timing_(new VCMTiming(clock_)),
video_receiver_(clock_, nullptr, this, timing_.get(), this, this),
stats_proxy_(&config_, clock_),
@@ -95,6 +98,7 @@ VideoReceiveStream::VideoReceiveStream(
call_stats_->rtcp_rtt_stats(),
packet_router,
&config_,
+ rtp_receive_statistics_.get(),
&stats_proxy_,
process_thread_,
this, // NackSender
@@ -120,7 +124,7 @@ VideoReceiveStream::VideoReceiveStream(
decoder_payload_types.insert(decoder.payload_type);
}
- video_receiver_.SetRenderDelay(config.render_delay_ms);
+ video_receiver_.SetRenderDelay(config_.render_delay_ms);
jitter_estimator_.reset(new VCMJitterEstimator(clock_));
frame_buffer_.reset(new video_coding::FrameBuffer(
@@ -131,9 +135,12 @@ VideoReceiveStream::VideoReceiveStream(
// Register with RtpStreamReceiverController.
media_receiver_ = receiver_controller->CreateReceiver(
config_.rtp.remote_ssrc, &rtp_video_stream_receiver_);
- if (config.rtp.rtx_ssrc) {
+ if (config_.rtp.rtx_ssrc) {
+ rtx_receive_stream_ = rtc::MakeUnique<RtxReceiveStream>(
+ &rtp_video_stream_receiver_, config.rtp.rtx_associated_payload_types,
+ config_.rtp.remote_ssrc, rtp_receive_statistics_.get());
rtx_receiver_ = receiver_controller->CreateReceiver(
- config_.rtp.rtx_ssrc, &rtp_video_stream_receiver_);
+ config_.rtp.rtx_ssrc, rtx_receive_stream_.get());
}
}
« no previous file with comments | « webrtc/video/video_receive_stream.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698