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

Side by Side Diff: content/common/media/media_player_messages_android.h

Issue 257323003: Remove the IPC to request DemuxerConfigs when config changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: adding CHECK to enforce the optional demuxer_configs only has 0 or 1 element Created 6 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 android media player. 5 // IPC messages for android media player.
6 // Multiply-included message file, hence no include guard. 6 // Multiply-included message file, hence no include guard.
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "content/common/content_export.h" 10 #include "content/common/content_export.h"
(...skipping 24 matching lines...) Expand all
35 IPC_STRUCT_TRAITS_MEMBER(video_size) 35 IPC_STRUCT_TRAITS_MEMBER(video_size)
36 IPC_STRUCT_TRAITS_MEMBER(is_video_encrypted) 36 IPC_STRUCT_TRAITS_MEMBER(is_video_encrypted)
37 IPC_STRUCT_TRAITS_MEMBER(video_extra_data) 37 IPC_STRUCT_TRAITS_MEMBER(video_extra_data)
38 38
39 IPC_STRUCT_TRAITS_MEMBER(duration) 39 IPC_STRUCT_TRAITS_MEMBER(duration)
40 IPC_STRUCT_TRAITS_END() 40 IPC_STRUCT_TRAITS_END()
41 41
42 IPC_STRUCT_TRAITS_BEGIN(media::DemuxerData) 42 IPC_STRUCT_TRAITS_BEGIN(media::DemuxerData)
43 IPC_STRUCT_TRAITS_MEMBER(type) 43 IPC_STRUCT_TRAITS_MEMBER(type)
44 IPC_STRUCT_TRAITS_MEMBER(access_units) 44 IPC_STRUCT_TRAITS_MEMBER(access_units)
45 IPC_STRUCT_TRAITS_MEMBER(demuxer_configs)
45 IPC_STRUCT_TRAITS_END() 46 IPC_STRUCT_TRAITS_END()
46 47
47 IPC_STRUCT_TRAITS_BEGIN(media::AccessUnit) 48 IPC_STRUCT_TRAITS_BEGIN(media::AccessUnit)
48 IPC_STRUCT_TRAITS_MEMBER(status) 49 IPC_STRUCT_TRAITS_MEMBER(status)
49 IPC_STRUCT_TRAITS_MEMBER(end_of_stream) 50 IPC_STRUCT_TRAITS_MEMBER(end_of_stream)
50 IPC_STRUCT_TRAITS_MEMBER(data) 51 IPC_STRUCT_TRAITS_MEMBER(data)
51 IPC_STRUCT_TRAITS_MEMBER(timestamp) 52 IPC_STRUCT_TRAITS_MEMBER(timestamp)
52 IPC_STRUCT_TRAITS_MEMBER(key_id) 53 IPC_STRUCT_TRAITS_MEMBER(key_id)
53 IPC_STRUCT_TRAITS_MEMBER(iv) 54 IPC_STRUCT_TRAITS_MEMBER(iv)
54 IPC_STRUCT_TRAITS_MEMBER(subsamples) 55 IPC_STRUCT_TRAITS_MEMBER(subsamples)
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 IPC_MESSAGE_CONTROL3(MediaPlayerMsg_DemuxerSeekRequest, 169 IPC_MESSAGE_CONTROL3(MediaPlayerMsg_DemuxerSeekRequest,
169 int /* demuxer_client_id */, 170 int /* demuxer_client_id */,
170 base::TimeDelta /* time_to_seek */, 171 base::TimeDelta /* time_to_seek */,
171 bool /* is_browser_seek */) 172 bool /* is_browser_seek */)
172 173
173 // The media source player reads data from demuxer 174 // The media source player reads data from demuxer
174 IPC_MESSAGE_CONTROL2(MediaPlayerMsg_ReadFromDemuxer, 175 IPC_MESSAGE_CONTROL2(MediaPlayerMsg_ReadFromDemuxer,
175 int /* demuxer_client_id */, 176 int /* demuxer_client_id */,
176 media::DemuxerStream::Type /* type */) 177 media::DemuxerStream::Type /* type */)
177 178
178 // The player needs new config data
179 IPC_MESSAGE_CONTROL1(MediaPlayerMsg_MediaConfigRequest,
180 int /* demuxer_client_id */)
181
182 // Clank has connected to the remote device. 179 // Clank has connected to the remote device.
183 IPC_MESSAGE_ROUTED2(MediaPlayerMsg_ConnectedToRemoteDevice, 180 IPC_MESSAGE_ROUTED2(MediaPlayerMsg_ConnectedToRemoteDevice,
184 int /* player_id */, 181 int /* player_id */,
185 std::string /* remote_playback_message */) 182 std::string /* remote_playback_message */)
186 183
187 // Clank has disconnected from the remote device. 184 // Clank has disconnected from the remote device.
188 IPC_MESSAGE_ROUTED1(MediaPlayerMsg_DisconnectedFromRemoteDevice, 185 IPC_MESSAGE_ROUTED1(MediaPlayerMsg_DisconnectedFromRemoteDevice,
189 int /* player_id */) 186 int /* player_id */)
190 187
191 // Instructs the video element to enter fullscreen. 188 // Instructs the video element to enter fullscreen.
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 274
278 #if defined(VIDEO_HOLE) 275 #if defined(VIDEO_HOLE)
279 // Notify the player about the external surface, requesting it if necessary. 276 // Notify the player about the external surface, requesting it if necessary.
280 // |is_request| true if the player is requesting the external surface. 277 // |is_request| true if the player is requesting the external surface.
281 // |rect| the boundary rectangle of the video element. 278 // |rect| the boundary rectangle of the video element.
282 IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_NotifyExternalSurface, 279 IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_NotifyExternalSurface,
283 int /* player_id */, 280 int /* player_id */,
284 bool /* is_request */, 281 bool /* is_request */,
285 gfx::RectF /* rect */) 282 gfx::RectF /* rect */)
286 #endif // defined(VIDEO_HOLE) 283 #endif // defined(VIDEO_HOLE)
OLDNEW
« no previous file with comments | « content/browser/media/android/browser_demuxer_android.cc ('k') | content/renderer/media/android/media_source_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698