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

Unified Diff: content/renderer/media/webmediaplayer_proxy_impl_android.cc

Issue 16098014: Handle config changes for MSE on android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/webmediaplayer_proxy_impl_android.cc
diff --git a/content/renderer/media/webmediaplayer_proxy_impl_android.cc b/content/renderer/media/webmediaplayer_proxy_impl_android.cc
index 74105f2dbd980686337704faac861f6387ed9372..14b6da835ed521d696e033fa65df90d6edb715f8 100644
--- a/content/renderer/media/webmediaplayer_proxy_impl_android.cc
+++ b/content/renderer/media/webmediaplayer_proxy_impl_android.cc
@@ -46,6 +46,7 @@ bool WebMediaPlayerProxyImplAndroid::OnMessageReceived(
IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause)
IPC_MESSAGE_HANDLER(MediaPlayerMsg_ReadFromDemuxer, OnReadFromDemuxer)
IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaSeekRequest, OnMediaSeekRequest)
+ IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaConfigRequest, OnMediaConfigRequest)
IPC_MESSAGE_HANDLER(MediaPlayerMsg_KeyAdded, OnKeyAdded)
IPC_MESSAGE_HANDLER(MediaPlayerMsg_KeyError, OnKeyError)
IPC_MESSAGE_HANDLER(MediaPlayerMsg_KeyMessage, OnKeyMessage)
@@ -249,14 +250,21 @@ webkit_media::WebMediaPlayerAndroid*
}
void WebMediaPlayerProxyImplAndroid::OnMediaSeekRequest(
- int player_id, base::TimeDelta time_to_seek, bool request_texture_peer) {
+ int player_id, base::TimeDelta time_to_seek, unsigned seek_request_id) {
webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
if (player) {
- Send(new MediaPlayerHostMsg_MediaSeekRequestAck(routing_id(), player_id));
- player->OnMediaSeekRequest(time_to_seek, request_texture_peer);
+ Send(new MediaPlayerHostMsg_MediaSeekRequestAck(routing_id(), player_id,
+ seek_request_id));
+ player->OnMediaSeekRequest(time_to_seek);
}
}
+void WebMediaPlayerProxyImplAndroid::OnMediaConfigRequest(int player_id) {
+ webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+ if (player)
+ player->OnMediaConfigRequest();
+}
+
void WebMediaPlayerProxyImplAndroid::OnKeyAdded(int player_id,
const std::string& key_system,
const std::string& session_id) {

Powered by Google App Engine
This is Rietveld 408576698