OLD | NEW |
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/media/media_player_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" |
(...skipping 21 matching lines...) Expand all Loading... |
32 OnMediaPlaybackCompleted) | 32 OnMediaPlaybackCompleted) |
33 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaBufferingUpdate, | 33 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaBufferingUpdate, |
34 OnMediaBufferingUpdate) | 34 OnMediaBufferingUpdate) |
35 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaSeekCompleted, OnMediaSeekCompleted) | 35 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaSeekCompleted, OnMediaSeekCompleted) |
36 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaError, OnMediaError) | 36 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaError, OnMediaError) |
37 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaVideoSizeChanged, | 37 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaVideoSizeChanged, |
38 OnVideoSizeChanged) | 38 OnVideoSizeChanged) |
39 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaTimeUpdate, OnTimeUpdate) | 39 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaTimeUpdate, OnTimeUpdate) |
40 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaPlayerReleased, | 40 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaPlayerReleased, |
41 OnMediaPlayerReleased) | 41 OnMediaPlayerReleased) |
42 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidEnterFullscreen, OnDidEnterFullscreen) | 42 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidEnterVideoView, OnDidEnterVideoView) |
43 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidExitFullscreen, OnDidExitFullscreen) | 43 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidExitVideoView, OnDidExitVideoView) |
44 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPlay, OnPlayerPlay) | 44 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPlay, OnPlayerPlay) |
45 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause) | 45 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause) |
46 IPC_MESSAGE_UNHANDLED(handled = false) | 46 IPC_MESSAGE_UNHANDLED(handled = false) |
47 IPC_END_MESSAGE_MAP() | 47 IPC_END_MESSAGE_MAP() |
48 return handled; | 48 return handled; |
49 } | 49 } |
50 | 50 |
51 void WebMediaPlayerProxyImplAndroid::Initialize( | 51 void WebMediaPlayerProxyImplAndroid::Initialize( |
52 int player_id, const std::string& url, | 52 int player_id, const std::string& url, |
53 const std::string& first_party_for_cookies) { | 53 const std::string& first_party_for_cookies) { |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 } | 133 } |
134 | 134 |
135 void WebMediaPlayerProxyImplAndroid::OnMediaPlayerReleased( | 135 void WebMediaPlayerProxyImplAndroid::OnMediaPlayerReleased( |
136 int player_id) { | 136 int player_id) { |
137 webkit_media::WebMediaPlayerImplAndroid* player = | 137 webkit_media::WebMediaPlayerImplAndroid* player = |
138 GetWebMediaPlayer(player_id); | 138 GetWebMediaPlayer(player_id); |
139 if (player) | 139 if (player) |
140 player->OnPlayerReleased(); | 140 player->OnPlayerReleased(); |
141 } | 141 } |
142 | 142 |
143 void WebMediaPlayerProxyImplAndroid::OnDidEnterFullscreen( | 143 void WebMediaPlayerProxyImplAndroid::OnDidEnterVideoView( |
144 int player_id) { | 144 int player_id, int personality) { |
| 145 LOG(INFO) << "player_id = " << player_id << ", personality = " << personality; |
145 webkit_media::WebMediaPlayerImplAndroid* player = | 146 webkit_media::WebMediaPlayerImplAndroid* player = |
146 GetWebMediaPlayer(player_id); | 147 GetWebMediaPlayer(player_id); |
147 if (player) | 148 if (player) |
148 player->OnDidEnterFullscreen(); | 149 player->OnDidEnterVideoView(personality); |
149 } | 150 } |
150 | 151 |
151 void WebMediaPlayerProxyImplAndroid::OnDidExitFullscreen( | 152 void WebMediaPlayerProxyImplAndroid::OnDidExitVideoView( |
152 int player_id) { | 153 int player_id, int personality) { |
| 154 LOG(INFO) << "player_id = " << player_id << ", personality = " << personality; |
153 webkit_media::WebMediaPlayerImplAndroid* player = | 155 webkit_media::WebMediaPlayerImplAndroid* player = |
154 GetWebMediaPlayer(player_id); | 156 GetWebMediaPlayer(player_id); |
155 if (player) | 157 if (player) |
156 player->OnDidExitFullscreen(); | 158 player->OnDidExitVideoView(personality); |
157 } | 159 } |
158 | 160 |
159 void WebMediaPlayerProxyImplAndroid::OnPlayerPlay(int player_id) { | 161 void WebMediaPlayerProxyImplAndroid::OnPlayerPlay(int player_id) { |
160 webkit_media::WebMediaPlayerImplAndroid* player = | 162 webkit_media::WebMediaPlayerImplAndroid* player = |
161 GetWebMediaPlayer(player_id); | 163 GetWebMediaPlayer(player_id); |
162 if (player) | 164 if (player) |
163 player->OnMediaPlayerPlay(); | 165 player->OnMediaPlayerPlay(); |
164 } | 166 } |
165 | 167 |
166 void WebMediaPlayerProxyImplAndroid::OnPlayerPause(int player_id) { | 168 void WebMediaPlayerProxyImplAndroid::OnPlayerPause(int player_id) { |
(...skipping 11 matching lines...) Expand all Loading... |
178 Send(new MediaPlayerHostMsg_ExitFullscreen(routing_id(), player_id)); | 180 Send(new MediaPlayerHostMsg_ExitFullscreen(routing_id(), player_id)); |
179 } | 181 } |
180 | 182 |
181 webkit_media::WebMediaPlayerImplAndroid* | 183 webkit_media::WebMediaPlayerImplAndroid* |
182 WebMediaPlayerProxyImplAndroid::GetWebMediaPlayer(int player_id) { | 184 WebMediaPlayerProxyImplAndroid::GetWebMediaPlayer(int player_id) { |
183 return static_cast<webkit_media::WebMediaPlayerImplAndroid*>( | 185 return static_cast<webkit_media::WebMediaPlayerImplAndroid*>( |
184 manager_->GetMediaPlayer(player_id)); | 186 manager_->GetMediaPlayer(player_id)); |
185 } | 187 } |
186 | 188 |
187 } // namespace content | 189 } // namespace content |
OLD | NEW |