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

Side by Side Diff: content/renderer/media/webmediaplayer_proxy_impl_android.cc

Issue 10979047: Upstream fullscreen video implementation for android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merging latest changes Created 8 years, 2 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
« no previous file with comments | « content/renderer/media/webmediaplayer_proxy_impl_android.h ('k') | ipc/ipc_message_utils.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/renderer/media/webmediaplayer_proxy_impl_android.h" 5 #include "content/renderer/media/webmediaplayer_proxy_impl_android.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "content/common/view_messages.h" 9 #include "content/common/media/media_player_messages.h"
10 #include "webkit/media/android/webmediaplayer_impl_android.h" 10 #include "webkit/media/android/webmediaplayer_impl_android.h"
11 #include "webkit/media/android/webmediaplayer_manager_android.h" 11 #include "webkit/media/android/webmediaplayer_manager_android.h"
12 12
13 namespace content { 13 namespace content {
14 14
15 WebMediaPlayerProxyImplAndroid::WebMediaPlayerProxyImplAndroid( 15 WebMediaPlayerProxyImplAndroid::WebMediaPlayerProxyImplAndroid(
16 content::RenderView* render_view, 16 content::RenderView* render_view,
17 webkit_media::WebMediaPlayerManagerAndroid* manager) 17 webkit_media::WebMediaPlayerManagerAndroid* manager)
18 : content::RenderViewObserver(render_view), 18 : content::RenderViewObserver(render_view),
19 manager_(manager) { 19 manager_(manager) {
20 } 20 }
21 21
22 WebMediaPlayerProxyImplAndroid::~WebMediaPlayerProxyImplAndroid() { 22 WebMediaPlayerProxyImplAndroid::~WebMediaPlayerProxyImplAndroid() {
23 Send(new ViewHostMsg_DestroyAllMediaPlayers(routing_id())); 23 Send(new MediaPlayerHostMsg_DestroyAllMediaPlayers(routing_id()));
24 } 24 }
25 25
26 bool WebMediaPlayerProxyImplAndroid::OnMessageReceived( 26 bool WebMediaPlayerProxyImplAndroid::OnMessageReceived(
27 const IPC::Message& msg) { 27 const IPC::Message& msg) {
28 bool handled = true; 28 bool handled = true;
29 IPC_BEGIN_MESSAGE_MAP(WebMediaPlayerProxyImplAndroid, msg) 29 IPC_BEGIN_MESSAGE_MAP(WebMediaPlayerProxyImplAndroid, msg)
30 IPC_MESSAGE_HANDLER(ViewMsg_MediaPrepared, OnMediaPrepared) 30 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaPrepared, OnMediaPrepared)
31 IPC_MESSAGE_HANDLER(ViewMsg_MediaPlaybackCompleted, 31 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaPlaybackCompleted,
32 OnMediaPlaybackCompleted) 32 OnMediaPlaybackCompleted)
33 IPC_MESSAGE_HANDLER(ViewMsg_MediaBufferingUpdate, OnMediaBufferingUpdate) 33 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaBufferingUpdate,
34 IPC_MESSAGE_HANDLER(ViewMsg_MediaSeekCompleted, OnMediaSeekCompleted) 34 OnMediaBufferingUpdate)
35 IPC_MESSAGE_HANDLER(ViewMsg_MediaError, OnMediaError) 35 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaSeekCompleted, OnMediaSeekCompleted)
36 IPC_MESSAGE_HANDLER(ViewMsg_MediaVideoSizeChanged, OnVideoSizeChanged) 36 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaError, OnMediaError)
37 IPC_MESSAGE_HANDLER(ViewMsg_MediaTimeUpdate, OnTimeUpdate) 37 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaVideoSizeChanged,
38 IPC_MESSAGE_HANDLER(ViewMsg_MediaPlayerReleased, OnMediaPlayerReleased) 38 OnVideoSizeChanged)
39 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaTimeUpdate, OnTimeUpdate)
40 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaPlayerReleased,
41 OnMediaPlayerReleased)
42 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidEnterFullscreen, OnDidEnterFullscreen)
43 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidExitFullscreen, OnDidExitFullscreen)
44 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPlay, OnPlayerPlay)
45 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause)
39 IPC_MESSAGE_UNHANDLED(handled = false) 46 IPC_MESSAGE_UNHANDLED(handled = false)
40 IPC_END_MESSAGE_MAP() 47 IPC_END_MESSAGE_MAP()
41 return handled; 48 return handled;
42 } 49 }
43 50
44 void WebMediaPlayerProxyImplAndroid::Initialize( 51 void WebMediaPlayerProxyImplAndroid::Initialize(
45 int player_id, const std::string& url, 52 int player_id, const std::string& url,
46 const std::string& first_party_for_cookies) { 53 const std::string& first_party_for_cookies) {
47 Send(new ViewHostMsg_MediaPlayerInitialize( 54 Send(new MediaPlayerHostMsg_MediaPlayerInitialize(
48 routing_id(), player_id, url, first_party_for_cookies)); 55 routing_id(), player_id, url, first_party_for_cookies));
49 } 56 }
50 57
51 void WebMediaPlayerProxyImplAndroid::Start(int player_id) { 58 void WebMediaPlayerProxyImplAndroid::Start(int player_id) {
52 Send(new ViewHostMsg_MediaPlayerStart(routing_id(), player_id)); 59 Send(new MediaPlayerHostMsg_MediaPlayerStart(routing_id(), player_id));
53 } 60 }
54 61
55 void WebMediaPlayerProxyImplAndroid::Pause(int player_id) { 62 void WebMediaPlayerProxyImplAndroid::Pause(int player_id) {
56 Send(new ViewHostMsg_MediaPlayerPause(routing_id(), player_id)); 63 Send(new MediaPlayerHostMsg_MediaPlayerPause(routing_id(), player_id));
57 } 64 }
58 65
59 void WebMediaPlayerProxyImplAndroid::Seek(int player_id, base::TimeDelta time) { 66 void WebMediaPlayerProxyImplAndroid::Seek(int player_id, base::TimeDelta time) {
60 Send(new ViewHostMsg_MediaPlayerSeek(routing_id(), player_id, time)); 67 Send(new MediaPlayerHostMsg_MediaPlayerSeek(routing_id(), player_id, time));
61 } 68 }
62 69
63 void WebMediaPlayerProxyImplAndroid::ReleaseResources(int player_id) { 70 void WebMediaPlayerProxyImplAndroid::ReleaseResources(int player_id) {
64 Send(new ViewHostMsg_MediaPlayerRelease(routing_id(), player_id)); 71 Send(new MediaPlayerHostMsg_MediaPlayerRelease(routing_id(), player_id));
65 } 72 }
66 73
67 void WebMediaPlayerProxyImplAndroid::DestroyPlayer(int player_id) { 74 void WebMediaPlayerProxyImplAndroid::DestroyPlayer(int player_id) {
68 Send(new ViewHostMsg_DestroyMediaPlayer(routing_id(), player_id)); 75 Send(new MediaPlayerHostMsg_DestroyMediaPlayer(routing_id(), player_id));
69 } 76 }
70 77
71 void WebMediaPlayerProxyImplAndroid::OnMediaPrepared( 78 void WebMediaPlayerProxyImplAndroid::OnMediaPrepared(
72 int player_id, 79 int player_id,
73 base::TimeDelta duration) { 80 base::TimeDelta duration) {
74 webkit_media::WebMediaPlayerImplAndroid* player = 81 webkit_media::WebMediaPlayerImplAndroid* player =
75 GetWebMediaPlayer(player_id); 82 GetWebMediaPlayer(player_id);
76 if (player) 83 if (player)
77 player->OnMediaPrepared(duration); 84 player->OnMediaPrepared(duration);
78 } 85 }
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 } 133 }
127 134
128 void WebMediaPlayerProxyImplAndroid::OnMediaPlayerReleased( 135 void WebMediaPlayerProxyImplAndroid::OnMediaPlayerReleased(
129 int player_id) { 136 int player_id) {
130 webkit_media::WebMediaPlayerImplAndroid* player = 137 webkit_media::WebMediaPlayerImplAndroid* player =
131 GetWebMediaPlayer(player_id); 138 GetWebMediaPlayer(player_id);
132 if (player) 139 if (player)
133 player->OnPlayerReleased(); 140 player->OnPlayerReleased();
134 } 141 }
135 142
143 void WebMediaPlayerProxyImplAndroid::OnDidEnterFullscreen(
144 int player_id) {
145 webkit_media::WebMediaPlayerImplAndroid* player =
146 GetWebMediaPlayer(player_id);
147 if (player)
148 player->OnDidEnterFullscreen();
149 }
150
151 void WebMediaPlayerProxyImplAndroid::OnDidExitFullscreen(
152 int player_id) {
153 webkit_media::WebMediaPlayerImplAndroid* player =
154 GetWebMediaPlayer(player_id);
155 if (player)
156 player->OnDidExitFullscreen();
157 }
158
159 void WebMediaPlayerProxyImplAndroid::OnPlayerPlay(int player_id) {
160 webkit_media::WebMediaPlayerImplAndroid* player =
161 GetWebMediaPlayer(player_id);
162 if (player)
163 player->OnMediaPlayerPlay();
164 }
165
166 void WebMediaPlayerProxyImplAndroid::OnPlayerPause(int player_id) {
167 webkit_media::WebMediaPlayerImplAndroid* player =
168 GetWebMediaPlayer(player_id);
169 if (player)
170 player->OnMediaPlayerPause();
171 }
172
173 void WebMediaPlayerProxyImplAndroid::EnterFullscreen(int player_id) {
174 Send(new MediaPlayerHostMsg_EnterFullscreen(routing_id(), player_id));
175 }
176
177 void WebMediaPlayerProxyImplAndroid::ExitFullscreen(int player_id) {
178 Send(new MediaPlayerHostMsg_ExitFullscreen(routing_id(), player_id));
179 }
180
136 webkit_media::WebMediaPlayerImplAndroid* 181 webkit_media::WebMediaPlayerImplAndroid*
137 WebMediaPlayerProxyImplAndroid::GetWebMediaPlayer(int player_id) { 182 WebMediaPlayerProxyImplAndroid::GetWebMediaPlayer(int player_id) {
138 return static_cast<webkit_media::WebMediaPlayerImplAndroid*>( 183 return static_cast<webkit_media::WebMediaPlayerImplAndroid*>(
139 manager_->GetMediaPlayer(player_id)); 184 manager_->GetMediaPlayer(player_id));
140 } 185 }
141 186
142 } // namespace content 187 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webmediaplayer_proxy_impl_android.h ('k') | ipc/ipc_message_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698