[Cast] Limit frames in flight by duration, and not by number of frames.

media/cast/net/rtp/rtp_sender.cc

 // Copyright 2014 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/net/rtp/rtp_sender.h"
 
 #include "base/big_endian.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "media/cast/net/cast_transport_defines.h"
@@ skipping 23 matching lines @@
       transport_(transport),
       transport_task_runner_(transport_task_runner),
       weak_factory_(this) {
   // Randomly set sequence number start value.
   config_.sequence_number = base::RandInt(0, 65535);
 }
 
 RtpSender::~RtpSender() {}
 
 bool RtpSender::Initialize(const CastTransportRtpConfig& config) {
-  storage_.reset(new PacketStorage(config.stored_frames));
-  if (!storage_->IsValid()) {
-    return false;
-  }
   config_.ssrc = config.ssrc;
   config_.payload_type = config.rtp_payload_type;
-  packetizer_.reset(new RtpPacketizer(transport_, storage_.get(), config_));
+  packetizer_.reset(new RtpPacketizer(transport_, &storage_, config_));
   return true;
 }
 
 void RtpSender::SendFrame(const EncodedFrame& frame) {
   DCHECK(packetizer_);
   packetizer_->SendFrameAsPackets(frame);
+  LOG_IF(DFATAL, storage_.GetNumberOfStoredFrames() >= kMaxUnackedFrames)

[hubbe, 2014/09/18 22:22:59]

I think it should be > not >=

[miu, 2014/09/19 19:39:43]

Oh, right.  Done.

+      << "Possible bug: Frames are not being actively released from storage.";
 }
 
 void RtpSender::ResendPackets(
     const MissingFramesAndPacketsMap& missing_frames_and_packets,
     bool cancel_rtx_if_not_in_list, const DedupInfo& dedup_info) {
-  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) {
     SendPacketVector packets_to_resend;
     uint8 frame_id = it->first;
     // Set of packets that the receiver wants us to re-send.
     // If empty, we need to re-send all packets for this frame.
     const PacketIdSet& missing_packet_set = it->second;
 
     bool resend_all = missing_packet_set.find(kRtcpCastAllPacketsLost) !=
         missing_packet_set.end();
     bool resend_last = missing_packet_set.find(kRtcpCastLastPacket) !=
         missing_packet_set.end();
 
-    const SendPacketVector* stored_packets = storage_->GetFrame8(frame_id);
+    const SendPacketVector* stored_packets = storage_.GetFrame8(frame_id);
     if (!stored_packets)
       continue;
 
     for (SendPacketVector::const_iterator it = stored_packets->begin();
          it != stored_packets->end(); ++it) {
       const PacketKey& packet_key = it->first;
       const uint16 packet_id = packet_key.second.second;
 
       // Should we resend the packet?
       bool resend = resend_all;
@@ skipping 22 matching lines @@
         transport_->CancelSendingPacket(it->first);
       }
     }
     transport_->ResendPackets(packets_to_resend, dedup_info);
   }
 }
 
 void RtpSender::CancelSendingFrames(const std::vector<uint32>& frame_ids) {
   for (std::vector<uint32>::const_iterator i = frame_ids.begin();
        i != frame_ids.end(); ++i) {
-    const SendPacketVector* stored_packets = storage_->GetFrame8(*i & 0xFF);
+    const SendPacketVector* stored_packets = storage_.GetFrame8(*i & 0xFF);
     if (!stored_packets)
       continue;
     for (SendPacketVector::const_iterator j = stored_packets->begin();
          j != stored_packets->end(); ++j) {
       transport_->CancelSendingPacket(j->first);
     }
+    storage_.ReleaseFrame(*i);
   }
 }
 
 void RtpSender::ResendFrameForKickstart(uint32 frame_id,
                                         base::TimeDelta dedupe_window) {
   // Send the last packet of the encoded frame to kick start
   // retransmission. This gives enough information to the receiver what
   // packets and frames are missing.
   MissingFramesAndPacketsMap missing_frames_and_packets;
   PacketIdSet missing;
@@ skipping 11 matching lines @@
   // TODO(miu): This is an abstraction violation.  This needs to be a part of
   // the overall packet (de)serialization consolidation.
   static const int kByteOffsetToSequenceNumber = 2;
   base::BigEndianWriter big_endian_writer(
       reinterpret_cast<char*>((&packet->front()) + kByteOffsetToSequenceNumber),
       sizeof(uint16));
   big_endian_writer.WriteU16(packetizer_->NextSequenceNumber());
 }
 
 int64 RtpSender::GetLastByteSentForFrame(uint32 frame_id) {
-  const SendPacketVector* stored_packets = storage_->GetFrame8(frame_id & 0xFF);
+  const SendPacketVector* stored_packets = storage_.GetFrame8(frame_id & 0xFF);
   if (!stored_packets)
     return 0;
   PacketKey last_packet_key = stored_packets->rbegin()->first;
   return transport_->GetLastByteSentForPacket(last_packet_key);
 }
 
 }  //  namespace cast
 }  // namespace media