admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop usage of legacy VCMPacketRequestCallback

Browse Source 
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 <asapersson@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27657}
This commit is contained in:
Niels Möller 2019-04-16 16:47:08 +02:00 committed by Commit Bot
parent bbdf0f67b3
commit c29fa1bf67
5 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
video/rtp_video_stream_receiver.cc
View File

@ -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<video_coding::RtpFrameObject> frame) {
RTC_DCHECK_RUN_ON(&network_tc_);

6
video/rtp_video_stream_receiver.h
View File

@ -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<uint16_t>& sequence_numbers);
// Implements VCMPacketRequestCallback.
int32_t ResendPackets(const uint16_t* sequenceNumbers,
uint16_t length) override;
// Implements OnAssembledFrameCallback.
void OnAssembledFrame(
std::unique_ptr<video_coding::RtpFrameObject> frame) override;

6
video/video_receive_stream.cc
View File

@ -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_|.

7
video/video_stream_decoder.cc
View File

@ -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<VideoFrame>* 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() {

3
video/video_stream_decoder.h
View File

@ -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<VideoFrame>* incoming_video_stream);
~VideoStreamDecoder() override;