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

Side by Side Diff: content/browser/android/media_player_manager_impl.cc

Issue 15499006: Enable seek in fullscreen mode for MSE impl on android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nits Created 7 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 #include "content/browser/android/media_player_manager_impl.h" 5 #include "content/browser/android/media_player_manager_impl.h"
6 6
7 #include "content/browser/android/media_resource_getter_impl.h" 7 #include "content/browser/android/media_resource_getter_impl.h"
8 #include "content/browser/web_contents/web_contents_view_android.h" 8 #include "content/browser/web_contents/web_contents_view_android.h"
9 #include "content/common/media/media_player_messages.h" 9 #include "content/common/media/media_player_messages.h"
10 #include "content/public/browser/browser_context.h" 10 #include "content/public/browser/browser_context.h"
(...skipping 28 matching lines...) Expand all
39 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerStart, OnStart) 39 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerStart, OnStart)
40 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerSeek, OnSeek) 40 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerSeek, OnSeek)
41 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerPause, OnPause) 41 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerPause, OnPause)
42 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerRelease, 42 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerRelease,
43 OnReleaseResources) 43 OnReleaseResources)
44 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyMediaPlayer, OnDestroyPlayer) 44 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyMediaPlayer, OnDestroyPlayer)
45 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyAllMediaPlayers, 45 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyAllMediaPlayers,
46 DestroyAllMediaPlayers) 46 DestroyAllMediaPlayers)
47 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DemuxerReady, 47 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DemuxerReady,
48 OnDemuxerReady) 48 OnDemuxerReady)
49 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_ReadFromDemuxerAck,
50 OnReadFromDemuxerAck)
51 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaSeekRequestAck,
52 OnMediaSeekRequestAck)
49 #if defined(GOOGLE_TV) 53 #if defined(GOOGLE_TV)
50 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_NotifyExternalSurface, 54 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_NotifyExternalSurface,
51 OnNotifyExternalSurface) 55 OnNotifyExternalSurface)
52 #endif 56 #endif
53 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_ReadFromDemuxerAck,
54 OnReadFromDemuxerAck)
55 IPC_MESSAGE_UNHANDLED(handled = false) 57 IPC_MESSAGE_UNHANDLED(handled = false)
56 IPC_END_MESSAGE_MAP() 58 IPC_END_MESSAGE_MAP()
57 return handled; 59 return handled;
58 } 60 }
59 61
60 void MediaPlayerManagerImpl::FullscreenPlayerPlay() { 62 void MediaPlayerManagerImpl::FullscreenPlayerPlay() {
61 MediaPlayerAndroid* player = GetFullscreenPlayer(); 63 MediaPlayerAndroid* player = GetFullscreenPlayer();
62 if (player) { 64 if (player) {
63 player->Start(); 65 player->Start();
64 Send(new MediaPlayerMsg_DidMediaPlayerPlay( 66 Send(new MediaPlayerMsg_DidMediaPlayerPlay(
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 #endif 236 #endif
235 237
236 void MediaPlayerManagerImpl::OnReadFromDemuxerAck( 238 void MediaPlayerManagerImpl::OnReadFromDemuxerAck(
237 int player_id, 239 int player_id,
238 const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) { 240 const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) {
239 MediaPlayerAndroid* player = GetPlayer(player_id); 241 MediaPlayerAndroid* player = GetPlayer(player_id);
240 if (player) 242 if (player)
241 player->ReadFromDemuxerAck(params); 243 player->ReadFromDemuxerAck(params);
242 } 244 }
243 245
246 void MediaPlayerManagerImpl::OnMediaSeekRequestAck(int player_id) {
247 MediaPlayerAndroid* player = GetPlayer(player_id);
248 if (player)
249 player->OnSeekRequestAck();
250 }
251
244 MediaPlayerAndroid* MediaPlayerManagerImpl::GetPlayer(int player_id) { 252 MediaPlayerAndroid* MediaPlayerManagerImpl::GetPlayer(int player_id) {
245 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin(); 253 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin();
246 it != players_.end(); ++it) { 254 it != players_.end(); ++it) {
247 if ((*it)->player_id() == player_id) 255 if ((*it)->player_id() == player_id)
248 return *it; 256 return *it;
249 } 257 }
250 return NULL; 258 return NULL;
251 } 259 }
252 260
253 MediaPlayerAndroid* MediaPlayerManagerImpl::GetFullscreenPlayer() { 261 MediaPlayerAndroid* MediaPlayerManagerImpl::GetFullscreenPlayer() {
(...skipping 23 matching lines...) Expand all
277 285
278 void MediaPlayerManagerImpl::OnBufferingUpdate( 286 void MediaPlayerManagerImpl::OnBufferingUpdate(
279 int player_id, int percentage) { 287 int player_id, int percentage) {
280 Send(new MediaPlayerMsg_MediaBufferingUpdate( 288 Send(new MediaPlayerMsg_MediaBufferingUpdate(
281 routing_id(), player_id, percentage)); 289 routing_id(), player_id, percentage));
282 if (fullscreen_player_id_ != -1) 290 if (fullscreen_player_id_ != -1)
283 video_view_.OnBufferingUpdate(percentage); 291 video_view_.OnBufferingUpdate(percentage);
284 } 292 }
285 293
286 void MediaPlayerManagerImpl::OnSeekComplete(int player_id, 294 void MediaPlayerManagerImpl::OnSeekComplete(int player_id,
287 base::TimeDelta current_time) { 295 base::TimeDelta current_time) {
288 Send(new MediaPlayerMsg_MediaSeekCompleted( 296 Send(new MediaPlayerMsg_MediaSeekCompleted(
289 routing_id(), player_id, current_time)); 297 routing_id(), player_id, current_time));
290 } 298 }
291 299
300 void MediaPlayerManagerImpl::OnMediaSeekRequest(int player_id,
301 base::TimeDelta time_to_seek) {
302 Send(new MediaPlayerMsg_MediaSeekRequest(
303 routing_id(), player_id, time_to_seek));
304 }
305
292 void MediaPlayerManagerImpl::OnError(int player_id, int error) { 306 void MediaPlayerManagerImpl::OnError(int player_id, int error) {
293 Send(new MediaPlayerMsg_MediaError(routing_id(), player_id, error)); 307 Send(new MediaPlayerMsg_MediaError(routing_id(), player_id, error));
294 if (fullscreen_player_id_ != -1) 308 if (fullscreen_player_id_ != -1)
295 video_view_.OnMediaPlayerError(error); 309 video_view_.OnMediaPlayerError(error);
296 } 310 }
297 311
298 void MediaPlayerManagerImpl::OnVideoSizeChanged( 312 void MediaPlayerManagerImpl::OnVideoSizeChanged(
299 int player_id, int width, int height) { 313 int player_id, int width, int height) {
300 Send(new MediaPlayerMsg_MediaVideoSizeChanged(routing_id(), player_id, 314 Send(new MediaPlayerMsg_MediaVideoSizeChanged(routing_id(), player_id,
301 width, height)); 315 width, height));
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 } 360 }
347 } 361 }
348 } 362 }
349 363
350 void MediaPlayerManagerImpl::ReleaseMediaResources( 364 void MediaPlayerManagerImpl::ReleaseMediaResources(
351 MediaPlayerAndroid* player) { 365 MediaPlayerAndroid* player) {
352 // Nothing needs to be done. 366 // Nothing needs to be done.
353 } 367 }
354 368
355 } // namespace content 369 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698