Cast: reduce the amount of retransmission packets

media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc

Index: media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc
diff --git a/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc b/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc
index 50ec42b7d2d7a1bced273a521665bd60b06776dd..d40f99f144671c27a9daad5a533e6d666d5e7cdc 100644
--- a/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc
+++ b/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc
@@ -93,23 +93,22 @@ void RtpPacketizer::SendFrameAsPackets(const EncodedFrame& frame) {
     packet->data.insert(packet->data.end(),
                         data_iter,
                         data_iter + payload_length);
-
-    PacketKey key = PacedPacketSender::MakePacketKey(frame.reference_time,
-                                                     config_.ssrc,
-                                                     packet_id_);
-
-    // Store packet.
-    packet_storage_->StorePacket(frame.frame_id, packet_id_, key, packet);
-    ++packet_id_;
     data_iter += payload_length;
 
+    const PacketKey key =
+        PacedPacketSender::MakePacketKey(frame.reference_time,
+                                         config_.ssrc,
+                                         packet_id_++);
+    packets.push_back(make_pair(key, packet));
+
     // Update stats.
     ++send_packet_count_;
     send_octet_count_ += payload_length;
-    packets.push_back(make_pair(key, packet));
   }
   DCHECK(packet_id_ == num_packets) << "Invalid state";
 
+  packet_storage_->StoreFrame(frame.frame_id, packets);

[miu, 2014/06/07 00:59:42]

Nice how the PacketStorage clean-up helped clean up code here too!  :)

[Alpha Left Google, 2014/06/07 01:15:09]

Done.

+
   // Send to network.
   transport_->SendPackets(packets);