From 943e2e6a57a2197d62e926796ae739ddeed2797b Mon Sep 17 00:00:00 2001
From: Andrey Logvin <landrey@webrtc.org>
Date: Thu, 3 Jun 2021 10:01:03 +0000
Subject: [PATCH] Revert "Fix incorrect SSRC in RtpPacketSendInfo for RTX
 packets."
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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}
---
 AUTHORS                                       |  1 -
 modules/rtp_rtcp/source/rtp_sender_egress.cc  |  2 +-
 .../source/rtp_sender_egress_unittest.cc      | 21 -------------------
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 6e05ced1fb..64488bfc62 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -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>
diff --git a/modules/rtp_rtcp/source/rtp_sender_egress.cc b/modules/rtp_rtcp/source/rtp_sender_egress.cc
index df50f38a9d..55dd9ff075 100644
--- a/modules/rtp_rtcp/source/rtp_sender_egress.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_egress.cc
@@ -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();
diff --git a/modules/rtp_rtcp/source/rtp_sender_egress_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_egress_unittest.cc
index 72a98b31e4..663638fab5 100644
--- a/modules/rtp_rtcp/source/rtp_sender_egress_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_egress_unittest.cc
@@ -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();