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

Do not register VideoSendStream to PacketFeedbackObserver when the current FEC controller do not use Loss Vector Mask.

Browse Source 
Bug: chromium:804865
Change-Id: Ib197ff05266a20b8358724e7d8bfe2b085a2de23
Reviewed-on: https://webrtc-review.googlesource.com/43123
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Commit-Queue: Ying Wang <yinwa@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21742}
This commit is contained in:
Ying Wang 2018-01-23 16:37:22 +01:00 committed by Commit Bot
parent b7d7301d7e
commit 8ed653d1c4
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/fec_controller.h
View File

@ -74,6 +74,9 @@ class FecController {
// Informs of encoded output. // Informs of encoded output.
virtual void UpdateWithEncodedData(const EncodedImage& encoded_image) = 0; virtual void UpdateWithEncodedData(const EncodedImage& encoded_image) = 0;
// Returns whether this FEC Controller needs Loss Vector Mask as input.
virtual bool UseLossVectorMask() = 0;
}; };
} // namespace webrtc } // namespace webrtc

1
modules/video_coding/fec_controller_default.h
View File

@ -40,6 +40,7 @@ class FecControllerDefault : public FecController {
std::vector<bool> loss_mask_vector, std::vector<bool> loss_mask_vector,
int64_t round_trip_time_ms) override; int64_t round_trip_time_ms) override;
void UpdateWithEncodedData(const EncodedImage& encoded_image) override; void UpdateWithEncodedData(const EncodedImage& encoded_image) override;
bool UseLossVectorMask() override { return false; }
private: private:
enum { kBitrateAverageWinMs = 1000 }; enum { kBitrateAverageWinMs = 1000 };

8
video/video_send_stream.cc
View File

@ -846,7 +846,9 @@ VideoSendStreamImpl::VideoSendStreamImpl(
fec_controller_->SetProtectionCallback(this); fec_controller_->SetProtectionCallback(this);
// Signal congestion controller this object is ready for OnPacket* callbacks. // Signal congestion controller this object is ready for OnPacket* callbacks.
transport_->send_side_cc()->RegisterPacketFeedbackObserver(this); if (fec_controller_->UseLossVectorMask()) {
transport_->send_side_cc()->RegisterPacketFeedbackObserver(this);
}
RTC_DCHECK(config_->encoder_settings.encoder); RTC_DCHECK(config_->encoder_settings.encoder);
RTC_DCHECK_GE(config_->encoder_settings.payload_type, 0); RTC_DCHECK_GE(config_->encoder_settings.payload_type, 0);
@ -890,7 +892,9 @@ VideoSendStreamImpl::~VideoSendStreamImpl() {
RTC_DCHECK(!payload_router_.IsActive()) RTC_DCHECK(!payload_router_.IsActive())
<< "VideoSendStreamImpl::Stop not called"; << "VideoSendStreamImpl::Stop not called";
RTC_LOG(LS_INFO) << "~VideoSendStreamInternal: " << config_->ToString(); RTC_LOG(LS_INFO) << "~VideoSendStreamInternal: " << config_->ToString();
transport_->send_side_cc()->DeRegisterPacketFeedbackObserver(this); if (fec_controller_->UseLossVectorMask()) {
transport_->send_side_cc()->DeRegisterPacketFeedbackObserver(this);
}
for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) { for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
transport_->packet_router()->RemoveSendRtpModule(rtp_rtcp); transport_->packet_router()->RemoveSendRtpModule(rtp_rtcp);
delete rtp_rtcp; delete rtp_rtcp;