Cast: Fix two video freezing problems

media/cast/transport/transport_video_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/transport/transport_video_sender.h"
 
-#include <list>
-
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "media/base/video_frame.h"
 #include "media/cast/transport/pacing/paced_sender.h"
 
 namespace media {
 namespace cast {
 namespace transport {
 
 TransportVideoSender::TransportVideoSender(
     const CastTransportVideoConfig& config,
     base::TickClock* clock,
     LoggingImpl* logging,
     const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner,
     PacedSender* const paced_packet_sender)
-    : rtp_max_delay_(base::TimeDelta::FromMilliseconds(
-          config.base.rtp_config.max_delay_ms)),
-      encryptor_(),
-      rtp_sender_(clock, logging, transport_task_runner, paced_packet_sender) {
+    : rtp_sender_(clock, logging, transport_task_runner, paced_packet_sender) {
   rtp_sender_.InitializeVideo(config);
-  initialized_ =
-      encryptor_.Initialize(config.base.aes_key, config.base.aes_iv_mask);
+  initialized_ = encryptor_.Initialize(config.rtp.config.aes_key,
+                                       config.rtp.config.aes_iv_mask);
 }
 
 TransportVideoSender::~TransportVideoSender() {}
 
 void TransportVideoSender::InsertCodedVideoFrame(
     const EncodedVideoFrame* coded_frame,
     const base::TimeTicks& capture_time) {
   if (encryptor_.initialized()) {
     EncodedVideoFrame encrypted_video_frame;
 
@@ skipping 31 matching lines @@
 }
 
 void TransportVideoSender::SubscribeVideoRtpStatsCallback(
     const CastTransportRtpStatistics& callback) {
   rtp_sender_.SubscribeRtpStatsCallback(callback);
 }
 
 }  // namespace transport
 }  // namespace cast
 }  // namespace media