Merge "Gallery2: Enable Suspend/Resume" (7c081262) · Commits · e / os / android_packages_apps_Gallery2

src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java

+8 −33

Original line number	Diff line number	Diff line
		@@ -370,7 +370,6 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr
		if (LOG) {
		Log.v(TAG, "surfaceCreated(" + holder + ")");
		}
		/*
		if (mCurrentState == STATE_SUSPENDED) {
		mSurfaceHolder = holder;
		mMediaPlayer.setDisplay(mSurfaceHolder);
		@@ -387,12 +386,6 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr
		release(false);
		}
		}
		*/
		if (mCurrentState == STATE_SUSPENDED) {
		mSurfaceHolder = holder;
		mMediaPlayer.setDisplay(mSurfaceHolder);
		release(false);
		}
		mSurfaceHolder = holder;
		openVideo();
		}
		@@ -629,7 +622,9 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr
		}

		public void surfaceCreated(SurfaceHolder holder) {
		/*
		if (LOG) {
		Log.v(TAG, "surfaceCreated(" + holder + ")");
		}
		if (mCurrentState == STATE_SUSPENDED) {
		mSurfaceHolder = holder;
		mMediaPlayer.setDisplay(mSurfaceHolder);
		@@ -648,17 +643,6 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr
		}
		mSurfaceHolder = holder;
		openVideo();
		*/
		if (LOG) {
		Log.v(TAG, "surfaceCreated(" + holder + ")");
		}
		if (mCurrentState == STATE_SUSPENDED) {
		mSurfaceHolder = holder;
		mMediaPlayer.setDisplay(mSurfaceHolder);
		release(false);
		}
		mSurfaceHolder = holder;
		openVideo();
		}

		public void surfaceDestroyed(SurfaceHolder holder) {
		@@ -783,7 +767,6 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr
		}

		public void suspend() {
		/*
		// HTTP streaming will call mMediaPlayer->suspend(), others will call release()
		if (isHTTPStreaming(mUri) && mCurrentState != STATE_PREPARING) {
		if (mMediaPlayer != null) {
		@@ -793,13 +776,13 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr
		return;
		}
		}
		}*/
		}
		release(false);
		}

		public void resume() {
		/*
		// HTTP streaming (with suspended status) will call mMediaPlayer->resume(), others will call openVideo()
		// HTTP streaming (with suspended status) will call mMediaPlayer->resume(),
		// others will call openVideo()
		if (mCurrentState == STATE_SUSPENDED) {
		if (mSurfaceHolder != null) {
		// The surface hasn't been destroyed
		@@ -817,16 +800,8 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr
		release(false);
		}
		} else {
		// The surface has been destroyed, resume operation will be done after surface created
		return;
		}
		}*/
		// HTTP streaming (with suspended status) will call mMediaPlayer->resume(), others will call openVideo()
		if (mCurrentState == STATE_SUSPENDED) {
		if (mSurfaceHolder != null) {
		release(false);
		} else {
		// The surface has been destroyed, resume operation will be done after surface created
		// The surface has been destroyed, resume operation will be done
		// after surface created
		return;
		}
		}