Cast: Fix two video freezing problems

media/cast/transport/cast_transport_config.h

 // 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.
 
 #ifndef MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_
 #define MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 18 matching lines @@
 enum AudioCodec {
   kFakeSoftwareAudio,
   kOpus,
   kPcm16,
   kExternalAudio,
   kAudioCodecLast = kExternalAudio
 };
 
 struct RtpConfig {
   RtpConfig();
-  int history_ms;  // The time RTP packets are stored for retransmissions.
+  ~RtpConfig();
+  uint32 ssrc;
   int max_delay_ms;
   int payload_type;
+  std::string aes_key;      // Binary string of size kAesKeySize.
+  std::string aes_iv_mask;  // Binary string of size kAesBlockSize.
 };
 
-// TODO(mikhal): Consider combining this with the cast_sender config.
-struct CastTransportBaseConfig {
-  CastTransportBaseConfig();
-  ~CastTransportBaseConfig();
-
-  uint32 ssrc;
-  RtpConfig rtp_config;
-  std::string aes_key;      // Binary string of size kAesKeySize.
-  std::string aes_iv_mask;  // Binary string of size kAesBlockSize.
+struct CastTransportRtpConfig {
+  CastTransportRtpConfig();
+  ~CastTransportRtpConfig();
+  RtpConfig config;
+  int max_outstanding_frames;
 };
 
 struct CastTransportAudioConfig {
   CastTransportAudioConfig();
   ~CastTransportAudioConfig();
 
-  CastTransportBaseConfig base;
+  CastTransportRtpConfig rtp;
   AudioCodec codec;
   int frequency;
   int channels;
 };
 
 struct CastTransportVideoConfig {
   CastTransportVideoConfig();
   ~CastTransportVideoConfig();
 
-  CastTransportBaseConfig base;
+  CastTransportRtpConfig rtp;
   VideoCodec codec;
 };
 
 struct EncodedVideoFrame {
   EncodedVideoFrame();
   ~EncodedVideoFrame();
 
   VideoCodec codec;
   bool key_frame;
   uint32 frame_id;
@@ skipping 98 matching lines @@
          lhs.rtp_timestamp == rhs.rtp_timestamp &&
          lhs.send_packet_count == rhs.send_packet_count &&
          lhs.send_octet_count == rhs.send_octet_count;
 }
 
 }  // namespace transport
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_