Index: chrome/common/cast_messages.h |
diff --git a/chrome/common/cast_messages.h b/chrome/common/cast_messages.h |
index a3276ab643f1ef3494bf9d2a9960aebcb532946d..91ca19c9d37781e6647c045d2f94ef4dab677b44 100644 |
--- a/chrome/common/cast_messages.h |
+++ b/chrome/common/cast_messages.h |
@@ -28,19 +28,11 @@ IPC_ENUM_TRAITS_MAX_VALUE(media::cast::CastLoggingEvent, |
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(frame_id) |
+ IPC_STRUCT_TRAITS_MEMBER(base_frame_id) |
IPC_STRUCT_TRAITS_MEMBER(rtp_timestamp) |
- 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(reference_time) |
IPC_STRUCT_TRAITS_MEMBER(data) |
IPC_STRUCT_TRAITS_END() |
@@ -134,17 +126,15 @@ IPC_MESSAGE_CONTROL2( |
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, |