Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 65e08329: Merge "Better support for HTML5 audio loop." into jb-dev

Browse Source 
* commit '65e08329ee57f2c4cda679885db700ceaca6c842':
  Better support for HTML5 audio loop.
This commit is contained in:
Teng-Hui Zhu
2012-05-25 10:13:08 -07:00
committed by Android Git Automerger
parent c6df8417ea 65e08329ee
commit 314745cd56
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/java/android/webkit/HTML5Audio.java
View File

@@ -67,6 +67,8 @@ class HTML5Audio extends Handler
private String mUrl; private String mUrl;
private boolean mAskToPlay = false; private boolean mAskToPlay = false;
private boolean mLoopEnabled = false;
private boolean mProcessingOnEnd = false;
private Context mContext; private Context mContext;
// Timer thread -> UI thread // Timer thread -> UI thread
@@ -143,7 +145,13 @@ class HTML5Audio extends Handler
// MediaPlayer.OnCompletionListener; // MediaPlayer.OnCompletionListener;
public void onCompletion(MediaPlayer mp) { public void onCompletion(MediaPlayer mp) {
mState = COMPLETE; mState = COMPLETE;
mProcessingOnEnd = true;
nativeOnEnded(mNativePointer); nativeOnEnded(mNativePointer);
mProcessingOnEnd = false;
if (mLoopEnabled == true) {
nativeOnRequestPlay(mNativePointer);
mLoopEnabled = false;
}
} }
// MediaPlayer.OnErrorListener // MediaPlayer.OnErrorListener
@@ -264,14 +272,10 @@ class HTML5Audio extends Handler
private void play() { private void play() {
if (mState == COMPLETE) { if (mState == COMPLETE && mLoopEnabled == true) {
// Play it again, Sam // Play it again, Sam
mTimer.cancel(); mMediaPlayer.start();
mTimer = new Timer(); mState = STARTED;
mAskToPlay = true;
mMediaPlayer.stop();
mState = STOPPED;
mMediaPlayer.prepareAsync();
return; return;
} }
@@ -304,14 +308,11 @@ class HTML5Audio extends Handler
} }
private void seek(int msec) { private void seek(int msec) {
if (mProcessingOnEnd == true && mState == COMPLETE && msec == 0) {
mLoopEnabled = true;
}
if (mState >= PREPARED) { if (mState >= PREPARED) {
mMediaPlayer.seekTo(msec); mMediaPlayer.seekTo(msec);
if (mState == COMPLETE) {
// Seeking after the stream had completed will
// cause us to start playing again. This is to
// support audio tags that specify loop=true.
play();
}
} }
} }
@@ -336,6 +337,7 @@ class HTML5Audio extends Handler
private native void nativeOnBuffering(int percent, int nativePointer); private native void nativeOnBuffering(int percent, int nativePointer);
private native void nativeOnEnded(int nativePointer); private native void nativeOnEnded(int nativePointer);
private native void nativeOnRequestPlay(int nativePointer);
private native void nativeOnPrepared(int duration, int width, int height, int nativePointer); private native void nativeOnPrepared(int duration, int width, int height, int nativePointer);
private native void nativeOnTimeupdate(int position, int nativePointer); private native void nativeOnTimeupdate(int position, int nativePointer);