Cast: Deduplicate packets in paced sender and always send older packets first

media/cast/transport/rtp_sender/rtp_sender.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cast/transport/rtp_sender/rtp_sender.h"
 
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "media/cast/transport/cast_transport_defines.h"
 #include "media/cast/transport/pacing/paced_sender.h"
@@ skipping 60 matching lines @@
 }
 
 void RtpSender::ResendPackets(
     const MissingFramesAndPacketsMap& missing_frames_and_packets) {
   DCHECK(storage_);
   // Iterate over all frames in the list.
   for (MissingFramesAndPacketsMap::const_iterator it =
            missing_frames_and_packets.begin();
        it != missing_frames_and_packets.end();
        ++it) {
-    PacketList packets_to_resend;
+    SendPacketVector packets_to_resend;
     uint8 frame_id = it->first;
     const PacketIdSet& packets_set = it->second;
     bool success = false;
 
     if (packets_set.empty()) {
       VLOG(3) << "Missing all packets in frame " << static_cast<int>(frame_id);
 
       uint16 packet_id = 0;
       do {
         // Get packet from storage.
         success = storage_->GetPacket(frame_id, packet_id, &packets_to_resend);
 
         // Resend packet to the network.
         if (success) {
           VLOG(3) << "Resend " << static_cast<int>(frame_id) << ":"
                   << packet_id;
           // Set a unique incremental sequence number for every packet.
-          PacketRef packet = packets_to_resend.back();
+          PacketRef packet = packets_to_resend.back().second;
           UpdateSequenceNumber(&packet->data);
           // Set the size as correspond to each frame.
           ++packet_id;
         }
       } while (success);
     } else {
       // Iterate over all of the packets in the frame.
       for (PacketIdSet::const_iterator set_it = packets_set.begin();
            set_it != packets_set.end();
            ++set_it) {
         uint16 packet_id = *set_it;
         success = storage_->GetPacket(frame_id, packet_id, &packets_to_resend);
 
         // Resend packet to the network.
         if (success) {
           VLOG(3) << "Resend " << static_cast<int>(frame_id) << ":"
                   << packet_id;
-          PacketRef packet = packets_to_resend.back();
+          PacketRef packet = packets_to_resend.back().second;
           UpdateSequenceNumber(&packet->data);
         }
       }
     }
     transport_->ResendPackets(packets_to_resend);
   }
 }
 
 void RtpSender::UpdateSequenceNumber(Packet* packet) {
   uint16 new_sequence_number = packetizer_->NextSequenceNumber();
@@ skipping 22 matching lines @@
   packetizer_->LastSentTimestamp(&time_sent, &rtp_timestamp);
   sender_info.send_packet_count = packetizer_->send_packets_count();
   sender_info.send_octet_count = packetizer_->send_octet_count();
   stats_callback_.Run(sender_info, time_sent, rtp_timestamp);
   ScheduleNextStatsReport();
 }
 
 }  // namespace transport
 }  //  namespace cast
 }  // namespace media