zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simpliy RtcpTransceiver::SendImmediateFeedback signature

Browse Source 
and add implementation comment

Bug: webrtc:8239
Change-Id: Id24937018d386e386b8241aca8f5d686e7cc527a
Reviewed-on: https://webrtc-review.googlesource.com/26600
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20925}
This commit is contained in:
Danil Chapovalov
2017-11-28 19:53:33 +01:00
committed by Commit Bot
parent 2723fb162c
commit 8d19e03e95
5 changed files with 34 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
modules/rtp_rtcp/source/rtcp_transceiver_impl.cc
View File

@ -134,39 +134,29 @@ void RtcpTransceiverImpl::UnsetRemb() {
void RtcpTransceiverImpl::SendNack(uint32_t ssrc,
std::vector<uint16_t> sequence_numbers) {
RTC_DCHECK(!sequence_numbers.empty());
SendImmediateFeedback([&](PacketSender* sender) {
rtcp::Nack nack;
nack.SetSenderSsrc(config_.feedback_ssrc);
nack.SetMediaSsrc(ssrc);
nack.SetPacketIds(std::move(sequence_numbers));
sender->AppendPacket(nack);
});
rtcp::Nack nack;
nack.SetSenderSsrc(config_.feedback_ssrc);
nack.SetMediaSsrc(ssrc);
nack.SetPacketIds(std::move(sequence_numbers));
SendImmediateFeedback(nack);
}
void RtcpTransceiverImpl::SendPictureLossIndication(
rtc::ArrayView<const uint32_t> ssrcs) {
RTC_DCHECK(!ssrcs.empty());
SendImmediateFeedback([this, ssrcs](PacketSender* sender) {
for (uint32_t media_ssrc : ssrcs) {
rtcp::Pli pli;
pli.SetSenderSsrc(config_.feedback_ssrc);
pli.SetMediaSsrc(media_ssrc);
sender->AppendPacket(pli);
}
});
void RtcpTransceiverImpl::SendPictureLossIndication(uint32_t ssrc) {
rtcp::Pli pli;
pli.SetSenderSsrc(config_.feedback_ssrc);
pli.SetMediaSsrc(ssrc);
SendImmediateFeedback(pli);
}
void RtcpTransceiverImpl::SendFullIntraRequest(
rtc::ArrayView<const uint32_t> ssrcs) {
RTC_DCHECK(!ssrcs.empty());
SendImmediateFeedback([this, ssrcs](PacketSender* sender) {
rtcp::Fir fir;
fir.SetSenderSsrc(config_.feedback_ssrc);
for (uint32_t media_ssrc : ssrcs)
fir.AddRequestTo(media_ssrc,
remote_senders_[media_ssrc].fir_sequence_number++);
sender->AppendPacket(fir);
});
rtcp::Fir fir;
fir.SetSenderSsrc(config_.feedback_ssrc);
for (uint32_t media_ssrc : ssrcs)
fir.AddRequestTo(media_ssrc,
remote_senders_[media_ssrc].fir_sequence_number++);
SendImmediateFeedback(fir);
}
void RtcpTransceiverImpl::HandleReceivedPacket(
@ -255,15 +245,17 @@ void RtcpTransceiverImpl::SendPeriodicCompoundPacket() {
}
void RtcpTransceiverImpl::SendImmediateFeedback(
rtc::FunctionView<void(PacketSender*)> append_feedback) {
const rtcp::RtcpPacket& rtcp_packet) {
PacketSender sender(config_.outgoing_transport, config_.max_packet_size);
// Compound mode requires every sent rtcp packet to be compound, i.e. start
// with a sender or receiver report.
if (config_.rtcp_mode == RtcpMode::kCompound)
CreateCompoundPacket(&sender);
append_feedback(&sender);
sender.AppendPacket(rtcp_packet);
sender.Send();
// If compound packet was sent, delay (reschedule) the periodic one.
if (config_.rtcp_mode == RtcpMode::kCompound)
ReschedulePeriodicCompoundPackets();
}