Cast: Fix two video freezing problems

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 15 matching lines @@
       transport_(transport),
       stats_callback_(),
       transport_task_runner_(transport_task_runner),
       weak_factory_(this) {
   // Randomly set sequence number start value.
   config_.sequence_number = base::RandInt(0, 65535);
 }
 
 RtpSender::~RtpSender() {}
 
-void RtpSender::InitializeAudio(const CastTransportAudioConfig& config) {
-  storage_.reset(new PacketStorage(clock_, config.base.rtp_config.history_ms));
+bool RtpSender::InitializeAudio(const CastTransportAudioConfig& config) {
+  storage_.reset(new PacketStorage(config.rtp.max_outstanding_frames));
+  if (!storage_->IsValid()) {
+    return false;
+  }
   config_.audio = true;
-  config_.ssrc = config.base.ssrc;
-  config_.payload_type = config.base.rtp_config.payload_type;
+  config_.ssrc = config.rtp.config.ssrc;
+  config_.payload_type = config.rtp.config.payload_type;
   config_.frequency = config.frequency;
   config_.audio_codec = config.codec;
-  packetizer_.reset(
-      new RtpPacketizer(transport_, storage_.get(), config_));
+  packetizer_.reset(new RtpPacketizer(transport_, storage_.get(), config_));
+  return true;
 }
 
-void RtpSender::InitializeVideo(const CastTransportVideoConfig& config) {
-  storage_.reset(new PacketStorage(clock_, config.base.rtp_config.history_ms));
+bool RtpSender::InitializeVideo(const CastTransportVideoConfig& config) {
+  storage_.reset(new PacketStorage(config.rtp.max_outstanding_frames));
+  if (!storage_->IsValid()) {
+    return false;
+  }
   config_.audio = false;
-  config_.ssrc = config.base.ssrc;
-  config_.payload_type = config.base.rtp_config.payload_type;
+  config_.ssrc = config.rtp.config.ssrc;
+  config_.payload_type = config.rtp.config.payload_type;
   config_.frequency = kVideoFrequency;
   config_.video_codec = config.codec;
-  packetizer_.reset(
-      new RtpPacketizer(transport_, storage_.get(), config_));
+  packetizer_.reset(new RtpPacketizer(transport_, storage_.get(), config_));
+  return true;
 }
 
 void RtpSender::IncomingEncodedVideoFrame(const EncodedVideoFrame* video_frame,
                                           const base::TimeTicks& capture_time) {
   DCHECK(packetizer_);
   packetizer_->IncomingEncodedVideoFrame(video_frame, capture_time);
 }
 
 void RtpSender::IncomingEncodedAudioFrame(
     const EncodedAudioFrame* audio_frame,
@@ skipping 16 matching lines @@
     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);
 
+        // Check that we got at least one packet.
+        DCHECK(packet_id != 0 || success)
+            << "Failed to resend frame " << static_cast<int>(frame_id);
+
         // 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().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);
 
+        // Check that we got at least one packet.
+        DCHECK(set_it != packets_set.begin() || success)
+            << "Failed to resend frame " << frame_id;
+
         // Resend packet to the network.
         if (success) {
           VLOG(3) << "Resend " << static_cast<int>(frame_id) << ":"
                   << packet_id;
           PacketRef packet = packets_to_resend.back().second;
           UpdateSequenceNumber(&packet->data);
         }
       }
     }
     transport_->ResendPackets(packets_to_resend);
@@ skipping 27 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