From c29fa1bf67cb141ee931d1985a64586dab285d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Tue, 16 Apr 2019 16:47:08 +0200 Subject: [PATCH] Drop usage of legacy VCMPacketRequestCallback MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's called from VideoReceiver::Process, which we no longer use. Bug: webrtc:7408 Change-Id: I2ce5b7a07437e110d20d04aa159dddf245504abe Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/133189 Reviewed-by: Åsa Persson Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#27657} --- video/rtp_video_stream_receiver.cc | 5 ----- video/rtp_video_stream_receiver.h | 6 ------ video/video_receive_stream.cc | 6 ++---- video/video_stream_decoder.cc | 7 ------- video/video_stream_decoder.h | 3 --- 5 files changed, 2 insertions(+), 25 deletions(-) diff --git a/video/rtp_video_stream_receiver.cc b/video/rtp_video_stream_receiver.cc index 2381bef81d..a281d5ecb6 100644 --- a/video/rtp_video_stream_receiver.cc +++ b/video/rtp_video_stream_receiver.cc @@ -400,11 +400,6 @@ bool RtpVideoStreamReceiver::IsDecryptable() const { return frames_decryptable_.load(); } -int32_t RtpVideoStreamReceiver::ResendPackets(const uint16_t* sequence_numbers, - uint16_t length) { - return rtp_rtcp_->SendNACK(sequence_numbers, length); -} - void RtpVideoStreamReceiver::OnAssembledFrame( std::unique_ptr frame) { RTC_DCHECK_RUN_ON(&network_tc_); diff --git a/video/rtp_video_stream_receiver.h b/video/rtp_video_stream_receiver.h index 14f5f4d428..068b47a02c 100644 --- a/video/rtp_video_stream_receiver.h +++ b/video/rtp_video_stream_receiver.h @@ -32,7 +32,6 @@ #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/contributing_sources.h" #include "modules/video_coding/h264_sps_pps_tracker.h" -#include "modules/video_coding/include/video_coding_defines.h" #include "modules/video_coding/loss_notification_controller.h" #include "modules/video_coding/packet_buffer.h" #include "modules/video_coding/rtp_frame_reference_finder.h" @@ -59,7 +58,6 @@ class UlpfecReceiver; class RtpVideoStreamReceiver : public LossNotificationSender, public RecoveredPacketReceiver, public RtpPacketSinkInterface, - public VCMPacketRequestCallback, public video_coding::OnAssembledFrameCallback, public video_coding::OnCompleteFrameCallback, public OnDecryptedFrameCallback, @@ -136,10 +134,6 @@ class RtpVideoStreamReceiver : public LossNotificationSender, // Don't use, still experimental. void RequestPacketRetransmit(const std::vector& sequence_numbers); - // Implements VCMPacketRequestCallback. - int32_t ResendPackets(const uint16_t* sequenceNumbers, - uint16_t length) override; - // Implements OnAssembledFrameCallback. void OnAssembledFrame( std::unique_ptr frame) override; diff --git a/video/video_receive_stream.cc b/video/video_receive_stream.cc index 29c88201d4..4aaa886a78 100644 --- a/video/video_receive_stream.cc +++ b/video/video_receive_stream.cc @@ -377,10 +377,8 @@ void VideoReceiveStream::Start() { } RTC_DCHECK(renderer != nullptr); - video_stream_decoder_.reset(new VideoStreamDecoder( - &video_receiver_, &rtp_video_stream_receiver_, - rtp_video_stream_receiver_.IsRetransmissionsEnabled(), protected_by_fec, - &stats_proxy_, renderer)); + video_stream_decoder_.reset( + new VideoStreamDecoder(&video_receiver_, &stats_proxy_, renderer)); // Make sure we register as a stats observer *after* we've prepared the // |video_stream_decoder_|. diff --git a/video/video_stream_decoder.cc b/video/video_stream_decoder.cc index f6785fac9a..75152f6547 100644 --- a/video/video_stream_decoder.cc +++ b/video/video_stream_decoder.cc @@ -19,9 +19,6 @@ namespace webrtc { VideoStreamDecoder::VideoStreamDecoder( vcm::VideoReceiver* video_receiver, - VCMPacketRequestCallback* vcm_packet_request_callback, - bool enable_nack, - bool /* enable_fec */, ReceiveStatisticsProxy* receive_statistics_proxy, rtc::VideoSinkInterface* incoming_video_stream) : video_receiver_(video_receiver), @@ -30,10 +27,6 @@ VideoStreamDecoder::VideoStreamDecoder( RTC_DCHECK(video_receiver_); video_receiver_->RegisterReceiveCallback(this); - - VCMPacketRequestCallback* packet_request_callback = - enable_nack ? vcm_packet_request_callback : nullptr; - video_receiver_->RegisterPacketRequestCallback(packet_request_callback); } VideoStreamDecoder::~VideoStreamDecoder() { diff --git a/video/video_stream_decoder.h b/video/video_stream_decoder.h index c8ef92c7a3..b3381b4ad3 100644 --- a/video/video_stream_decoder.h +++ b/video/video_stream_decoder.h @@ -35,9 +35,6 @@ class VideoStreamDecoder : public VCMReceiveCallback { public: VideoStreamDecoder( vcm::VideoReceiver* video_receiver, - VCMPacketRequestCallback* vcm_packet_request_callback, - bool enable_nack, - bool enable_fec, ReceiveStatisticsProxy* receive_statistics_proxy, rtc::VideoSinkInterface* incoming_video_stream); ~VideoStreamDecoder() override;