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

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

Issue 23787002: Rename MediaPlayerHostMsg_{DemuxerReady,ReadFromDemuxerAck}_Params to Media{Configs,Data}. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser_media_player_manager.h" 5 #include "content/browser/android/browser_media_player_manager.h"
6 6
7 #include "content/browser/android/content_view_core_impl.h" 7 #include "content/browser/android/content_view_core_impl.h"
8 #include "content/browser/android/media_resource_getter_impl.h" 8 #include "content/browser/android/media_resource_getter_impl.h"
9 #include "content/browser/web_contents/web_contents_view_android.h" 9 #include "content/browser/web_contents/web_contents_view_android.h"
10 #include "content/common/media/media_player_messages_android.h" 10 #include "content/common/media/media_player_messages_android.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_ExitFullscreen, OnExitFullscreen) 60 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_ExitFullscreen, OnExitFullscreen)
61 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_Initialize, OnInitialize) 61 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_Initialize, OnInitialize)
62 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_Start, OnStart) 62 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_Start, OnStart)
63 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_Seek, OnSeek) 63 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_Seek, OnSeek)
64 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_Pause, OnPause) 64 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_Pause, OnPause)
65 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_SetVolume, OnSetVolume) 65 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_SetVolume, OnSetVolume)
66 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_Release, OnReleaseResources) 66 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_Release, OnReleaseResources)
67 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyMediaPlayer, OnDestroyPlayer) 67 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyMediaPlayer, OnDestroyPlayer)
68 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyAllMediaPlayers, 68 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyAllMediaPlayers,
69 DestroyAllMediaPlayers) 69 DestroyAllMediaPlayers)
70 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DemuxerReady, 70 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DemuxerReady, OnDemuxerReady)
71 OnDemuxerReady)
72 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_ReadFromDemuxerAck, 71 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_ReadFromDemuxerAck,
73 OnReadFromDemuxerAck) 72 OnReadFromDemuxerAck)
74 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DurationChanged, 73 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DurationChanged,
75 OnDurationChanged) 74 OnDurationChanged)
76 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaSeekRequestAck, 75 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaSeekRequestAck,
77 OnMediaSeekRequestAck) 76 OnMediaSeekRequestAck)
78 IPC_MESSAGE_HANDLER(MediaKeysHostMsg_InitializeCDM, 77 IPC_MESSAGE_HANDLER(MediaKeysHostMsg_InitializeCDM,
79 OnInitializeCDM) 78 OnInitializeCDM)
80 IPC_MESSAGE_HANDLER(MediaKeysHostMsg_GenerateKeyRequest, 79 IPC_MESSAGE_HANDLER(MediaKeysHostMsg_GenerateKeyRequest,
81 OnGenerateKeyRequest) 80 OnGenerateKeyRequest)
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 } 428 }
430 429
431 void BrowserMediaPlayerManager::OnDestroyPlayer(int player_id) { 430 void BrowserMediaPlayerManager::OnDestroyPlayer(int player_id) {
432 RemovePlayer(player_id); 431 RemovePlayer(player_id);
433 if (fullscreen_player_id_ == player_id) 432 if (fullscreen_player_id_ == player_id)
434 fullscreen_player_id_ = -1; 433 fullscreen_player_id_ = -1;
435 } 434 }
436 435
437 void BrowserMediaPlayerManager::OnDemuxerReady( 436 void BrowserMediaPlayerManager::OnDemuxerReady(
438 int player_id, 437 int player_id,
439 const media::MediaPlayerHostMsg_DemuxerReady_Params& params) { 438 const media::DemuxerConfigs& configs) {
440 MediaPlayerAndroid* player = GetPlayer(player_id); 439 MediaPlayerAndroid* player = GetPlayer(player_id);
441 if (player) 440 if (player)
442 player->DemuxerReady(params); 441 player->DemuxerReady(configs);
443 } 442 }
444 443
445 void BrowserMediaPlayerManager::OnReadFromDemuxerAck( 444 void BrowserMediaPlayerManager::OnReadFromDemuxerAck(
446 int player_id, 445 int player_id,
447 const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) { 446 const media::DemuxerData& data) {
448 MediaPlayerAndroid* player = GetPlayer(player_id); 447 MediaPlayerAndroid* player = GetPlayer(player_id);
449 if (player) 448 if (player)
450 player->ReadFromDemuxerAck(params); 449 player->ReadFromDemuxerAck(data);
451 } 450 }
452 451
453 void BrowserMediaPlayerManager::OnMediaSeekRequestAck( 452 void BrowserMediaPlayerManager::OnMediaSeekRequestAck(
454 int player_id, unsigned seek_request_id) { 453 int player_id, unsigned seek_request_id) {
455 MediaPlayerAndroid* player = GetPlayer(player_id); 454 MediaPlayerAndroid* player = GetPlayer(player_id);
456 if (player) 455 if (player)
457 player->OnSeekRequestAck(seek_request_id); 456 player->OnSeekRequestAck(seek_request_id);
458 } 457 }
459 458
460 void BrowserMediaPlayerManager::OnInitializeCDM( 459 void BrowserMediaPlayerManager::OnInitializeCDM(
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 if (!player || !drm_bridge) { 541 if (!player || !drm_bridge) {
543 NOTREACHED() << "OnSetMediaKeys(): Player and MediaKeys must be present."; 542 NOTREACHED() << "OnSetMediaKeys(): Player and MediaKeys must be present.";
544 return; 543 return;
545 } 544 }
546 // TODO(qinmin): add the logic to decide whether we should create the 545 // TODO(qinmin): add the logic to decide whether we should create the
547 // fullscreen surface for EME lv1. 546 // fullscreen surface for EME lv1.
548 player->SetDrmBridge(drm_bridge); 547 player->SetDrmBridge(drm_bridge);
549 } 548 }
550 549
551 } // namespace content 550 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/android/browser_media_player_manager.h ('k') | content/common/media/media_player_messages_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698