Merge "VideoView: Add logs for video start/stop profiling" (19f196c1) · Commits · e / os / android_frameworks_base

core/java/android/widget/VideoView.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -285,11 +285,13 @@ public class VideoView extends SurfaceView

		public void stopPlayback() {
		if (mMediaPlayer != null) {
		Log.i(TAG, "Playback Stop begin");
		mMediaPlayer.stop();
		mMediaPlayer.release();
		mMediaPlayer = null;
		mCurrentState = STATE_IDLE;
		mTargetState = STATE_IDLE;
		Log.i(TAG, "Playback Stop end");
		}
		}

		@@ -298,6 +300,8 @@ public class VideoView extends SurfaceView
		// not ready for playback just yet, will try again later
		return;
		}

		Log.i(TAG, "Open Video");
		// Tell the music playback service to pause
		// TODO: these constants need to be published somewhere in the framework.
		Intent i = new Intent("com.android.music.musicservicecommand");
		@@ -329,6 +333,7 @@ public class VideoView extends SurfaceView
		mMediaPlayer.setOnInfoListener(mInfoListener);
		mMediaPlayer.setOnBufferingUpdateListener(mBufferingUpdateListener);
		mCurrentBufferPercentage = 0;
		Log.i(TAG, "SetDataSource");
		mMediaPlayer.setDataSource(mContext, mUri, mHeaders);
		mMediaPlayer.setDisplay(mSurfaceHolder);
		mMediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
		@@ -741,8 +746,10 @@ public class VideoView extends SurfaceView
		@Override
		public void start() {
		if (isInPlaybackState()) {
		Log.i(TAG, "Playback Start begin");
		mMediaPlayer.start();
		mCurrentState = STATE_PLAYING;
		Log.i(TAG, "Playback Start end");
		}
		mTargetState = STATE_PLAYING;
		}
		@@ -759,6 +766,7 @@ public class VideoView extends SurfaceView
		}

		public void suspend() {
		Log.i(TAG, "Playback Suspend begin");
		// HTTP streaming will call MediaPlayer::suspend() for suspend operation, others will call release()
		if (isHTTPStreaming(mUri) && mCurrentState > STATE_PREPARING && mMediaPlayer != null) {
		if (mMediaPlayer.suspend()) {
		@@ -768,6 +776,7 @@ public class VideoView extends SurfaceView
		}
		}
		release(false);
		Log.i(TAG, "Playback Suspend end");
		}

		public void resume() {