[Cast] Clean-up: Merge AudioReceiverConfig+VideoReceiverConfig-->FrameReceiverConfig.

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>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/stl_util.h"
 #include "media/cast/transport/cast_transport_defines.h"
 #include "net/base/ip_endpoint.h"
 
 namespace media {
 namespace cast {
 namespace transport {
 
 enum RtcpMode {
   kRtcpCompound,     // Compound RTCP mode is described by RFC 4585.
   kRtcpReducedSize,  // Reduced-size RTCP mode is described by RFC 5506.
 };
 
-enum VideoCodec { kFakeSoftwareVideo, kVp8, kH264, kVideoCodecLast = kH264 };
+enum VideoCodec {
+  kUnknownVideoCodec,
+  kFakeSoftwareVideo,
+  kVp8,
+  kH264,
+  kVideoCodecLast = kH264
+};
 
 enum AudioCodec {
+  kUnknownAudioCodec,
   kFakeSoftwareAudio,

[Alpha Left Google, 2014/05/29 02:35:11]

I think we can remove kFakeSoftwareAudio. I added this erroneously in a previous
change. Please remove it.

[miu, 2014/05/29 19:03:10]

Done.

   kOpus,
   kPcm16,
   kAudioCodecLast = kPcm16
 };
 
 struct RtpConfig {
   RtpConfig();
   ~RtpConfig();
   uint32 ssrc;
   int max_delay_ms;
@@ skipping 160 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_