| 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 652964a00604aafb88677dfbc6a98e532f58d084..f7144142a9ee1a149158f53c8263c334dc5503a0 100644
|
| --- a/content/renderer/media/webmediaplayer_proxy_impl_android.cc
|
| +++ b/content/renderer/media/webmediaplayer_proxy_impl_android.cc
|
| @@ -10,6 +10,10 @@
|
| #include "webkit/media/android/webmediaplayer_android.h"
|
| #include "webkit/media/android/webmediaplayer_manager_android.h"
|
|
|
| +#if defined(GOOGLE_TV)
|
| +#include "webkit/media/android/webmediaplayer_tv.h"
|
| +#endif
|
| +
|
| namespace content {
|
|
|
| WebMediaPlayerProxyImplAndroid::WebMediaPlayerProxyImplAndroid(
|
| @@ -53,11 +57,10 @@ bool WebMediaPlayerProxyImplAndroid::OnMessageReceived(
|
| }
|
|
|
| void WebMediaPlayerProxyImplAndroid::Initialize(
|
| - int player_id, const GURL& url,
|
| - bool is_media_source,
|
| + int player_id, const GURL& url, int flags,
|
| const GURL& first_party_for_cookies) {
|
| Send(new MediaPlayerHostMsg_MediaPlayerInitialize(
|
| - routing_id(), player_id, url, is_media_source, first_party_for_cookies));
|
| + routing_id(), player_id, url, flags, first_party_for_cookies));
|
| }
|
|
|
| void WebMediaPlayerProxyImplAndroid::Start(int player_id) {
|
| @@ -204,9 +207,12 @@ void WebMediaPlayerProxyImplAndroid::ReadFromDemuxerAck(
|
| routing_id(), player_id, params));
|
|
|
| }
|
| +
|
| void WebMediaPlayerProxyImplAndroid::OnReadFromDemuxer(
|
| int player_id, media::DemuxerStream::Type type, bool seek_done) {
|
| - webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
|
| + webkit_media::WebMediaPlayerTv* player =
|
| + static_cast<webkit_media::WebMediaPlayerTv*>(
|
| + manager_->GetMediaPlayer(player_id));
|
| if (player)
|
| player->OnReadFromDemuxer(type, seek_done);
|
| }
|
|
|