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

Revert "Fix incorrect SSRC in RtpPacketSendInfo for RTX packets."

Browse Source 
This reverts commit 82aa094a970a2c37634378910116bbe1d5abc633.

Reason for revert: Causes regression for an upstream project

Original change's description:
> Fix incorrect SSRC in RtpPacketSendInfo for RTX packets.
>
> Bug: webrtc:12713
> Change-Id: I1b5fb947ffe4ac80e23a6b891ea1a2c2156ba81f
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/218000
> Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
> Reviewed-by: Erik Språng <sprang@webrtc.org>
> Commit-Queue: Erik Språng <sprang@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#34177}

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: webrtc:12713
Change-Id: I20facf724bdb0136e7eb079c4834575184764174
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/221202
Reviewed-by: Andrey Logvin <landrey@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Andrey Logvin <landrey@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34218}
This commit is contained in:
Andrey Logvin 2021-06-03 10:01:03 +00:00 committed by WebRTC LUCI CQ
parent fa3ce637fa
commit 943e2e6a57
3 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -96,7 +96,6 @@ Silviu Caragea <silviu.cpp@gmail.com>
Stefan Gula <steweg@gmail.com>
Stephan Hartmann <stha09@googlemail.com>
Steve Reid <sreid@sea-to-sky.net>
Tao Chen <meemetao@gmail.com>
Tarun Chawla <trnkumarchawla@gmail.com>
Todd Wong <todd.wong.ndq@gmail.com>
Tomas Popela <tomas.popela@gmail.com>

2
modules/rtp_rtcp/source/rtp_sender_egress.cc
View File

@ -409,7 +409,7 @@ void RtpSenderEgress::AddPacketToTransportFeedback(
}
RtpPacketSendInfo packet_info;
packet_info.ssrc = packet.Ssrc();
packet_info.ssrc = ssrc_;
packet_info.transport_sequence_number = packet_id;
packet_info.rtp_sequence_number = packet.SequenceNumber();
packet_info.rtp_timestamp = packet.Timestamp();

21
modules/rtp_rtcp/source/rtp_sender_egress_unittest.cc
View File

@ -236,27 +236,6 @@ TEST_P(RtpSenderEgressTest, TransportFeedbackObserverGetsCorrectByteCount) {
sender->SendPacket(packet.get(), PacedPacketInfo());
}
TEST_P(RtpSenderEgressTest, TransportFeedbackObserverGetCorrectPacketSsrc) {
const uint16_t kTransportSequenceNumber = 17;
header_extensions_.RegisterByUri(kTransportSequenceNumberExtensionId,
TransportSequenceNumber::kUri);
std::unique_ptr<RtpPacketToSend> media_packet = BuildRtpPacket();
media_packet->SetSsrc(kSsrc);
media_packet->SetExtension<TransportSequenceNumber>(kTransportSequenceNumber);
std::unique_ptr<RtpPacketToSend> rtx_packet = BuildRtpPacket();
rtx_packet->SetSsrc(kRtxSsrc);
rtx_packet->SetExtension<TransportSequenceNumber>(kTransportSequenceNumber +
1);
rtx_packet->set_packet_type(RtpPacketMediaType::kPadding);
std::unique_ptr<RtpSenderEgress> sender = CreateRtpSenderEgress();
EXPECT_CALL(feedback_observer_,
OnAddPacket(Field(&RtpPacketSendInfo::ssrc, kSsrc)));
sender->SendPacket(media_packet.get(), PacedPacketInfo());
EXPECT_CALL(feedback_observer_,
OnAddPacket(Field(&RtpPacketSendInfo::ssrc, kRtxSsrc)));
sender->SendPacket(rtx_packet.get(), PacedPacketInfo());
}
TEST_P(RtpSenderEgressTest, PacketOptionsIsRetransmitSetByPacketType) {
std::unique_ptr<RtpSenderEgress> sender = CreateRtpSenderEgress();