[Cast] EncodedAudioFrame+EncodedVideoFrame+reference_time --> EncodedFrame

chrome/common/cast_messages.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.
 
 // IPC messages for the Cast transport API.
 // Multiply-included message file, hence no include guard.
 
 #include "ipc/ipc_message_macros.h"
 #include "media/cast/cast_sender.h"
 #include "media/cast/logging/logging_defines.h"
 #include "media/cast/rtcp/rtcp_defines.h"
 #include "media/cast/transport/cast_transport_sender.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_util.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_START CastMsgStart
 
+IPC_ENUM_TRAITS_MAX_VALUE(
+    media::cast::transport::EncodedFrame::Relationship,
+    media::cast::transport::EncodedFrame::RELATIONSHIP_LAST)
 IPC_ENUM_TRAITS_MAX_VALUE(media::cast::transport::AudioCodec,
                           media::cast::transport::kAudioCodecLast)
 IPC_ENUM_TRAITS_MAX_VALUE(media::cast::transport::VideoCodec,
                           media::cast::transport::kVideoCodecLast)
 IPC_ENUM_TRAITS_MAX_VALUE(media::cast::transport::CastTransportStatus,
                           media::cast::transport::CAST_TRANSPORT_STATUS_LAST)
 IPC_ENUM_TRAITS_MAX_VALUE(media::cast::CastLoggingEvent,
                           media::cast::kNumOfLoggingEvents)
 IPC_ENUM_TRAITS_MAX_VALUE(media::cast::EventMediaType,
                           media::cast::EVENT_MEDIA_TYPE_LAST)
 
-IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::EncodedAudioFrame)
-  IPC_STRUCT_TRAITS_MEMBER(codec)
+IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::EncodedFrame)
+  IPC_STRUCT_TRAITS_MEMBER(relationship)
   IPC_STRUCT_TRAITS_MEMBER(frame_id)
+  IPC_STRUCT_TRAITS_MEMBER(referenced_frame_id)
   IPC_STRUCT_TRAITS_MEMBER(rtp_timestamp)
+  IPC_STRUCT_TRAITS_MEMBER(reference_time)
   IPC_STRUCT_TRAITS_MEMBER(data)
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::EncodedVideoFrame)
-  IPC_STRUCT_TRAITS_MEMBER(codec)
-  IPC_STRUCT_TRAITS_MEMBER(key_frame)
-  IPC_STRUCT_TRAITS_MEMBER(frame_id)
-  IPC_STRUCT_TRAITS_MEMBER(last_referenced_frame_id)
-  IPC_STRUCT_TRAITS_MEMBER(rtp_timestamp)
-  IPC_STRUCT_TRAITS_MEMBER(data)
-IPC_STRUCT_TRAITS_END()
-
 IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::RtcpSenderInfo)
   IPC_STRUCT_TRAITS_MEMBER(ntp_seconds)
   IPC_STRUCT_TRAITS_MEMBER(ntp_fraction)
   IPC_STRUCT_TRAITS_MEMBER(rtp_timestamp)
   IPC_STRUCT_TRAITS_MEMBER(send_packet_count)
   IPC_STRUCT_TRAITS_MEMBER(send_octet_count)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::RtcpDlrrReportBlock)
   IPC_STRUCT_TRAITS_MEMBER(last_rr)
@@ skipping 70 matching lines @@
 IPC_MESSAGE_CONTROL2(
   CastHostMsg_InitializeAudio,
   int32 /*channel_id*/,
   media::cast::transport::CastTransportAudioConfig /*config*/)
 
 IPC_MESSAGE_CONTROL2(
   CastHostMsg_InitializeVideo,
   int32 /*channel_id*/,
   media::cast::transport::CastTransportVideoConfig /*config*/)
 
-IPC_MESSAGE_CONTROL3(
+IPC_MESSAGE_CONTROL2(
     CastHostMsg_InsertCodedAudioFrame,
     int32 /* channel_id */,
-    media::cast::transport::EncodedAudioFrame /* audio_frame */,
-    base::TimeTicks /* recorded_time */)
+    media::cast::transport::EncodedFrame /* audio_frame */)
 
-IPC_MESSAGE_CONTROL3(
+IPC_MESSAGE_CONTROL2(
     CastHostMsg_InsertCodedVideoFrame,
     int32 /* channel_id */,
-    media::cast::transport::EncodedVideoFrame /* video_frame */,
-    base::TimeTicks /* recorded_time */)
+    media::cast::transport::EncodedFrame /* video_frame */)
 
 IPC_MESSAGE_CONTROL4(
     CastHostMsg_SendRtcpFromRtpSender,
     int32 /* channel_id */,
     media::cast::transport::SendRtcpFromRtpSenderData /* flags, ssrc, name */,
     media::cast::transport::RtcpSenderInfo /* sender_info */,
     media::cast::transport::RtcpDlrrReportBlock /* dlrr */)
 
 IPC_MESSAGE_CONTROL3(
     CastHostMsg_ResendPackets,
     int32 /* channel_id */,
     bool /* is_audio */,
     media::cast::MissingFramesAndPacketsMap /* missing_packets */)
 
 IPC_MESSAGE_CONTROL2(
     CastHostMsg_New,
     int32 /* channel_id */,
     net::IPEndPoint /*remote_end_point*/);
 
 IPC_MESSAGE_CONTROL1(
     CastHostMsg_Delete,
     int32 /* channel_id */);