commit 6019d43a11106846836afe4b655e1f3e150bf0d0
author Sebastian Jansson <srte@webrtc.org> Mon May 27 14:24:29 2019 +0200
committer Commit Bot <commit-bot@chromium.org> Mon May 27 13:08:04 2019 +0000
tree 57061137022217ea68e7e75ad74d867153264e13
parent 126f2b37acdd09fa92b3aad9fcd5d27c7c2ac6b2

Removes using imports from flexfec_receiver.

The imports of Packet, ReceivedPacket from ForwardErrorCorrection::
collides with other usages of the names introduced in a followup CL.

Bug: webrtc:9883
Change-Id: Ib042c9091ad8e350cbdf01b837af09c820dbff33
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/138279
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28075}

modules/rtp_rtcp/source/flexfec_receiver.cc

diff --git a/modules/rtp_rtcp/source/flexfec_receiver.cc b/modules/rtp_rtcp/source/flexfec_receiver.cc
index d9850bf..27dacac 100644
--- a/modules/rtp_rtcp/source/flexfec_receiver.cc
+++ b/modules/rtp_rtcp/source/flexfec_receiver.cc
@@ -21,9 +21,6 @@
 
 namespace {
 
-using Packet = ForwardErrorCorrection::Packet;
-using ReceivedPacket = ForwardErrorCorrection::ReceivedPacket;
-
 // Minimum header size (in bytes) of a well-formed non-singular FlexFEC packet.
 constexpr size_t kMinFlexfecHeaderSize = 20;
 
@@ -71,7 +68,8 @@
   if (packet.recovered())
     return;
 
-  std::unique_ptr<ReceivedPacket> received_packet = AddReceivedPacket(packet);
+  std::unique_ptr<ForwardErrorCorrection::ReceivedPacket> received_packet =
+      AddReceivedPacket(packet);
   if (!received_packet)
     return;
 
@@ -85,8 +83,8 @@
 
 // TODO(eladalon): Consider using packet.recovered() to avoid processing
 // recovered packets here.
-std::unique_ptr<ReceivedPacket> FlexfecReceiver::AddReceivedPacket(
-    const RtpPacketReceived& packet) {
+std::unique_ptr<ForwardErrorCorrection::ReceivedPacket>
+FlexfecReceiver::AddReceivedPacket(const RtpPacketReceived& packet) {
   RTC_DCHECK_RUN_ON(&sequence_checker_);
 
   // RTP packets with a full base header (12 bytes), but without payload,
@@ -95,7 +93,8 @@
   RTC_DCHECK_GE(packet.size(), kRtpHeaderSize);
 
   // Demultiplex based on SSRC, and insert into erasure code decoder.
-  std::unique_ptr<ReceivedPacket> received_packet(new ReceivedPacket());
+  std::unique_ptr<ForwardErrorCorrection::ReceivedPacket> received_packet(
+      new ForwardErrorCorrection::ReceivedPacket());
   received_packet->seq_num = packet.SequenceNumber();
   received_packet->ssrc = packet.Ssrc();
   if (received_packet->ssrc == ssrc_) {
@@ -110,7 +109,8 @@
     // Insert packet payload into erasure code.
     // TODO(brandtr): Remove this memcpy when the FEC packet classes
     // are using COW buffers internally.
-    received_packet->pkt = rtc::scoped_refptr<Packet>(new Packet());
+    received_packet->pkt = rtc::scoped_refptr<ForwardErrorCorrection::Packet>(
+        new ForwardErrorCorrection::Packet());
     auto payload = packet.payload();
     memcpy(received_packet->pkt->data, payload.data(), payload.size());
     received_packet->pkt->length = payload.size();
@@ -124,7 +124,8 @@
 
     // Insert entire packet into erasure code.
     // TODO(brandtr): Remove this memcpy too.
-    received_packet->pkt = rtc::scoped_refptr<Packet>(new Packet());
+    received_packet->pkt = rtc::scoped_refptr<ForwardErrorCorrection::Packet>(
+        new ForwardErrorCorrection::Packet());
     memcpy(received_packet->pkt->data, packet.data(), packet.size());
     received_packet->pkt->length = packet.size();
   }
@@ -144,7 +145,7 @@
 // FlexFEC decoder, and we therefore do not interfere with the reception
 // of non-recovered media packets.
 void FlexfecReceiver::ProcessReceivedPacket(
-    const ReceivedPacket& received_packet) {
+    const ForwardErrorCorrection::ReceivedPacket& received_packet) {
   RTC_DCHECK_RUN_ON(&sequence_checker_);
 
   // Decode.