From bbb5eba591a4226e8a4ff8f617c6e86fd428664c Mon Sep 17 00:00:00 2001 From: "qinmin@chromium.org" Date: Wed, 8 May 2013 19:04:02 +0000 Subject: Add MediaPlayerAndroid as a super class for all media player implementations on android. There are several different implementations of media players on Android. Currently they all inherit from MediaPlayerBridge. This only works if their java player is a subclass of Android MediaPlayer class, which is not necessary in some cases. Additionally, we are not going to use any subclass of android MediaPlayer for MSE implementation As a result, this change introduces a super class for all the media player implementations. BUG=233420 R=scherkus@chromium.org, ycheo@chromium.org, yfriedman@chromium.org Review URL: https://codereview.chromium.org/14762006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198957 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/android/content_video_view.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'content/browser/android/content_video_view.cc') diff --git a/content/browser/android/content_video_view.cc b/content/browser/android/content_video_view.cc index 242134b..7f71cc4 100644 --- a/content/browser/android/content_video_view.cc +++ b/content/browser/android/content_video_view.cc @@ -87,27 +87,27 @@ void ContentVideoView::UpdateMediaMetadata() { } int ContentVideoView::GetVideoWidth(JNIEnv*, jobject obj) const { - media::MediaPlayerBridge* player = manager_->GetFullscreenPlayer(); + media::MediaPlayerAndroid* player = manager_->GetFullscreenPlayer(); return player ? player->GetVideoWidth() : 0; } int ContentVideoView::GetVideoHeight(JNIEnv*, jobject obj) const { - media::MediaPlayerBridge* player = manager_->GetFullscreenPlayer(); + media::MediaPlayerAndroid* player = manager_->GetFullscreenPlayer(); return player ? player->GetVideoHeight() : 0; } int ContentVideoView::GetDurationInMilliSeconds(JNIEnv*, jobject obj) const { - media::MediaPlayerBridge* player = manager_->GetFullscreenPlayer(); + media::MediaPlayerAndroid* player = manager_->GetFullscreenPlayer(); return player ? player->GetDuration().InMilliseconds() : -1; } int ContentVideoView::GetCurrentPosition(JNIEnv*, jobject obj) const { - media::MediaPlayerBridge* player = manager_->GetFullscreenPlayer(); + media::MediaPlayerAndroid* player = manager_->GetFullscreenPlayer(); return player ? player->GetCurrentTime().InMilliseconds() : 0; } bool ContentVideoView::IsPlaying(JNIEnv*, jobject obj) { - media::MediaPlayerBridge* player = manager_->GetFullscreenPlayer(); + media::MediaPlayerAndroid* player = manager_->GetFullscreenPlayer(); return player ? player->IsPlaying() : false; } @@ -135,12 +135,12 @@ void ContentVideoView::SetSurface(JNIEnv* env, jobject obj, } void ContentVideoView::UpdateMediaMetadata(JNIEnv* env, jobject obj) { - media::MediaPlayerBridge* player = manager_->GetFullscreenPlayer(); - if (player && player->prepared()) + media::MediaPlayerAndroid* player = manager_->GetFullscreenPlayer(); + if (player && player->IsPlayerReady()) Java_ContentVideoView_updateMediaMetadata( env, obj, player->GetVideoWidth(), player->GetVideoHeight(), - player->GetDuration().InMilliseconds(), player->can_pause(), - player->can_seek_forward(), player->can_seek_backward()); + player->GetDuration().InMilliseconds(), player->CanPause(), + player->CanSeekForward(), player->CanSeekBackward()); } } // namespace content -- cgit v1.1