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

am 8fac23f2: am 8be8ee4c: am f0afad00: Merge "Stop caching stream duration, it might change (increase) dynamically." into jb-mr1.1-dev

Browse Source 
* commit '8fac23f23df08b192a542be57b09badfbb0a1bf4':
  Stop caching stream duration, it might change (increase) dynamically.
This commit is contained in:
Andreas Huber
2012-11-28 09:47:50 -08:00
committed by Android Git Automerger
parent ec45cc096d 8fac23f23d
commit c653df4643
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,6 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {
// settable by the client
private Uri mUri;
private Map<String, String> mHeaders;
private int mDuration;
// all possible internal states
private static final int STATE_ERROR = -1;
@@ -247,7 +246,6 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {
mMediaPlayer = new MediaPlayer();
mMediaPlayer.setOnPreparedListener(mPreparedListener);
mMediaPlayer.setOnVideoSizeChangedListener(mSizeChangedListener);
mDuration = -1;
mMediaPlayer.setOnCompletionListener(mCompletionListener);
mMediaPlayer.setOnErrorListener(mErrorListener);
mMediaPlayer.setOnInfoListener(mOnInfoListener);
@@ -626,17 +624,12 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {
openVideo();
}
// cache duration as mDuration for faster access
public int getDuration() {
if (isInPlaybackState()) {
if (mDuration > 0) {
return mDuration;
}
mDuration = mMediaPlayer.getDuration();
return mDuration;
return mMediaPlayer.getDuration();
}
mDuration = -1;
return mDuration;
return -1;
}
public int getCurrentPosition() {