Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2310)

Side by Side Diff: chrome/common/cast_messages.h

Issue 519443002: Cast: merge InsertCoded{Audio,Video}Frame into InsertFrame (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // IPC messages for the Cast transport API. 5 // IPC messages for the Cast transport API.
6 // Multiply-included message file, hence no include guard. 6 // Multiply-included message file, hence no include guard.
7 7
8 #include "ipc/ipc_message_macros.h" 8 #include "ipc/ipc_message_macros.h"
9 #include "media/cast/cast_sender.h" 9 #include "media/cast/cast_sender.h"
10 #include "media/cast/logging/logging_defines.h" 10 #include "media/cast/logging/logging_defines.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 media::cast::CastTransportStatus /* status */) 107 media::cast::CastTransportStatus /* status */)
108 108
109 IPC_MESSAGE_CONTROL3(CastMsg_RawEvents, 109 IPC_MESSAGE_CONTROL3(CastMsg_RawEvents,
110 int32 /* channel_id */, 110 int32 /* channel_id */,
111 std::vector<media::cast::PacketEvent> /* packet_events */, 111 std::vector<media::cast::PacketEvent> /* packet_events */,
112 std::vector<media::cast::FrameEvent> /* frame_events */) 112 std::vector<media::cast::FrameEvent> /* frame_events */)
113 113
114 // Cast messages sent from the renderer to the browser. 114 // Cast messages sent from the renderer to the browser.
115 115
116 IPC_MESSAGE_CONTROL2( 116 IPC_MESSAGE_CONTROL2(
117 CastHostMsg_InitializeAudio, 117 CastHostMsg_InitializeAudio,
miu 2014/08/28 20:45:29 I wonder if you could do these also? Or, is there
hubbe 2014/08/28 22:20:56 Sounds like a great idea for my next CL. :)
118 int32 /*channel_id*/, 118 int32 /*channel_id*/,
119 media::cast::CastTransportRtpConfig /*config*/) 119 media::cast::CastTransportRtpConfig /*config*/)
120 120
121 IPC_MESSAGE_CONTROL2( 121 IPC_MESSAGE_CONTROL2(
122 CastHostMsg_InitializeVideo, 122 CastHostMsg_InitializeVideo,
123 int32 /*channel_id*/, 123 int32 /*channel_id*/,
124 media::cast::CastTransportRtpConfig /*config*/) 124 media::cast::CastTransportRtpConfig /*config*/)
125 125
126 IPC_MESSAGE_CONTROL2( 126 IPC_MESSAGE_CONTROL3(
127 CastHostMsg_InsertCodedAudioFrame, 127 CastHostMsg_InsertFrame,
128 int32 /* channel_id */, 128 int32 /* channel_id */,
129 media::cast::EncodedFrame /* audio_frame */) 129 uint32 /* ssrc */,
130 130 media::cast::EncodedFrame /* audio/video frame */)
131 IPC_MESSAGE_CONTROL2(
132 CastHostMsg_InsertCodedVideoFrame,
133 int32 /* channel_id */,
134 media::cast::EncodedFrame /* video_frame */)
135 131
136 IPC_MESSAGE_CONTROL4( 132 IPC_MESSAGE_CONTROL4(
137 CastHostMsg_SendSenderReport, 133 CastHostMsg_SendSenderReport,
138 int32 /* channel_id */, 134 int32 /* channel_id */,
139 uint32 /* ssrc */, 135 uint32 /* ssrc */,
140 base::TimeTicks /* current_time */, 136 base::TimeTicks /* current_time */,
141 uint32 /* current_time_as_rtp_timestamp */) 137 uint32 /* current_time_as_rtp_timestamp */)
142 138
143 IPC_MESSAGE_CONTROL3( 139 IPC_MESSAGE_CONTROL3(
144 CastHostMsg_CancelSendingFrames, 140 CastHostMsg_CancelSendingFrames,
145 int32 /* channel_id */, 141 int32 /* channel_id */,
146 uint32 /* ssrc */, 142 uint32 /* ssrc */,
147 std::vector<uint32> /* frame_ids */) 143 std::vector<uint32> /* frame_ids */)
148 144
149 IPC_MESSAGE_CONTROL3( 145 IPC_MESSAGE_CONTROL3(
150 CastHostMsg_ResendFrameForKickstart, 146 CastHostMsg_ResendFrameForKickstart,
151 int32 /* channel_id */, 147 int32 /* channel_id */,
152 uint32 /* ssrc */, 148 uint32 /* ssrc */,
153 uint32 /* frame_id */) 149 uint32 /* frame_id */)
154 150
155 IPC_MESSAGE_CONTROL2( 151 IPC_MESSAGE_CONTROL2(
156 CastHostMsg_New, 152 CastHostMsg_New,
157 int32 /* channel_id */, 153 int32 /* channel_id */,
158 net::IPEndPoint /*remote_end_point*/) 154 net::IPEndPoint /*remote_end_point*/)
159 155
160 IPC_MESSAGE_CONTROL1( 156 IPC_MESSAGE_CONTROL1(
161 CastHostMsg_Delete, 157 CastHostMsg_Delete,
162 int32 /* channel_id */) 158 int32 /* channel_id */)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698