drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 6154 into donut

Browse Source 
* changes:
  Fix bug (#1947162)
This commit is contained in:
Android (Google) Code Review
2009-07-06 11:37:13 -07:00
parent 70421cf6b4 aa00e390c1
commit 9479a516cf
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/widget/VideoView.java
View File

@ -55,6 +55,7 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {
private SurfaceHolder mSurfaceHolder = null; private SurfaceHolder mSurfaceHolder = null;
private MediaPlayer mMediaPlayer = null; private MediaPlayer mMediaPlayer = null;
private boolean mIsPrepared; private boolean mIsPrepared;
private boolean mIsPlaybackCompleted;
private int mVideoWidth; private int mVideoWidth;
private int mVideoHeight; private int mVideoHeight;
private int mSurfaceWidth; private int mSurfaceWidth;
@ -260,7 +261,7 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {
mSeekWhenPrepared = 0; mSeekWhenPrepared = 0;
} }
if (mStartWhenPrepared) { if (mStartWhenPrepared) {
mMediaPlayer.start(); start();
mStartWhenPrepared = false; mStartWhenPrepared = false;
if (mMediaController != null) { if (mMediaController != null) {
mMediaController.show(); mMediaController.show();
@ -281,7 +282,7 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {
mSeekWhenPrepared = 0; mSeekWhenPrepared = 0;
} }
if (mStartWhenPrepared) { if (mStartWhenPrepared) {
mMediaPlayer.start(); start();
mStartWhenPrepared = false; mStartWhenPrepared = false;
} }
} }
@ -291,6 +292,7 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {
private MediaPlayer.OnCompletionListener mCompletionListener = private MediaPlayer.OnCompletionListener mCompletionListener =
new MediaPlayer.OnCompletionListener() { new MediaPlayer.OnCompletionListener() {
public void onCompletion(MediaPlayer mp) { public void onCompletion(MediaPlayer mp) {
mIsPlaybackCompleted = true;
if (mMediaController != null) { if (mMediaController != null) {
mMediaController.hide(); mMediaController.hide();
} }
@ -405,7 +407,9 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {
mMediaPlayer.seekTo(mSeekWhenPrepared); mMediaPlayer.seekTo(mSeekWhenPrepared);
mSeekWhenPrepared = 0; mSeekWhenPrepared = 0;
} }
mMediaPlayer.start(); if (!mIsPlaybackCompleted) {
start();
}
if (mMediaController != null) { if (mMediaController != null) {
mMediaController.show(); mMediaController.show();
} }
@ -490,6 +494,7 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {
} }
public void start() { public void start() {
mIsPlaybackCompleted = false;
if (mMediaPlayer != null && mIsPrepared) { if (mMediaPlayer != null && mIsPrepared) {
mMediaPlayer.start(); mMediaPlayer.start();
mStartWhenPrepared = false; mStartWhenPrepared = false;