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

Merge "Enabled application using VideoView to get information events from MediaPlayer" into jb-mr1-dev

Browse Source
This commit is contained in:
James Dong
2012-07-30 13:37:08 -07:00
committed by Android (Google) Code Review
parent e72a6e977b a0ba79473b
commit 7267babae3
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -29254,6 +29254,7 @@ package android.widget {
method public void setMediaController(android.widget.MediaController); method public void setMediaController(android.widget.MediaController);
method public void setOnCompletionListener(android.media.MediaPlayer.OnCompletionListener); method public void setOnCompletionListener(android.media.MediaPlayer.OnCompletionListener);
method public void setOnErrorListener(android.media.MediaPlayer.OnErrorListener); method public void setOnErrorListener(android.media.MediaPlayer.OnErrorListener);
method public void setOnInfoListener(android.media.MediaPlayer.OnInfoListener);
method public void setOnPreparedListener(android.media.MediaPlayer.OnPreparedListener); method public void setOnPreparedListener(android.media.MediaPlayer.OnPreparedListener);
method public void setVideoPath(java.lang.String); method public void setVideoPath(java.lang.String);
method public void setVideoURI(android.net.Uri); method public void setVideoURI(android.net.Uri);

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

@@ -26,6 +26,7 @@ import android.media.MediaPlayer;
import android.media.Metadata; import android.media.Metadata;
import android.media.MediaPlayer.OnCompletionListener; import android.media.MediaPlayer.OnCompletionListener;
import android.media.MediaPlayer.OnErrorListener; import android.media.MediaPlayer.OnErrorListener;
import android.media.MediaPlayer.OnInfoListener;
import android.net.Uri; import android.net.Uri;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
@@ -84,6 +85,7 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {
private MediaPlayer.OnPreparedListener mOnPreparedListener; private MediaPlayer.OnPreparedListener mOnPreparedListener;
private int mCurrentBufferPercentage; private int mCurrentBufferPercentage;
private OnErrorListener mOnErrorListener; private OnErrorListener mOnErrorListener;
private OnInfoListener mOnInfoListener;
private int mSeekWhenPrepared; // recording the seek position while preparing private int mSeekWhenPrepared; // recording the seek position while preparing
private boolean mCanPause; private boolean mCanPause;
private boolean mCanSeekBack; private boolean mCanSeekBack;
@@ -230,6 +232,7 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {
mDuration = -1; mDuration = -1;
mMediaPlayer.setOnCompletionListener(mCompletionListener); mMediaPlayer.setOnCompletionListener(mCompletionListener);
mMediaPlayer.setOnErrorListener(mErrorListener); mMediaPlayer.setOnErrorListener(mErrorListener);
mMediaPlayer.setOnInfoListener(mOnInfoListener);
mMediaPlayer.setOnBufferingUpdateListener(mBufferingUpdateListener); mMediaPlayer.setOnBufferingUpdateListener(mBufferingUpdateListener);
mCurrentBufferPercentage = 0; mCurrentBufferPercentage = 0;
mMediaPlayer.setDataSource(mContext, mUri, mHeaders); mMediaPlayer.setDataSource(mContext, mUri, mHeaders);
@@ -455,6 +458,16 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {
mOnErrorListener = l; mOnErrorListener = l;
} }
/**
* Register a callback to be invoked when an informational event
* occurs during playback or setup.
*
* @param l The callback that will be run
*/
public void setOnInfoListener(OnInfoListener l) {
mOnInfoListener = l;
}
SurfaceHolder.Callback mSHCallback = new SurfaceHolder.Callback() SurfaceHolder.Callback mSHCallback = new SurfaceHolder.Callback()
{ {
public void surfaceChanged(SurfaceHolder holder, int format, public void surfaceChanged(SurfaceHolder holder, int format,