Index: webrtc/video/video_receive_stream.cc |
diff --git a/webrtc/video/video_receive_stream.cc b/webrtc/video/video_receive_stream.cc |
index ae14634a94602fd4d8af9af62f63e8d004716cc5..5af855b8dded2dc58a78c5078eab935289b6bd14 100644 |
--- a/webrtc/video/video_receive_stream.cc |
+++ b/webrtc/video/video_receive_stream.cc |
@@ -17,6 +17,7 @@ |
#include <utility> |
#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/location.h" |
#include "webrtc/rtc_base/logging.h" |
#include "webrtc/rtc_base/optional.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" |
@@ -120,7 +122,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 +133,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); |
rtx_receiver_ = receiver_controller->CreateReceiver( |
- config_.rtp.rtx_ssrc, &rtp_video_stream_receiver_); |
+ config_.rtp.rtx_ssrc, rtx_receive_stream_.get()); |
} |
} |