diff options
| author | Anand Chaudhari <anandc@codeaurora.org> | 2015-09-23 18:01:06 +0530 |
|---|---|---|
| committer | Jack Yoo <jyoo@codeaurora.org> | 2015-09-30 10:54:49 -0700 |
| commit | 922a2fa5c68bc6d301e96eca68cccbe9c10331b0 (patch) | |
| tree | cc22b95989369c15e73c6ca20aad608162a6e536 /src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java | |
| parent | 276a28999702d4dc9162c3109e3836f6d8e153b7 (diff) | |
| download | android_packages_apps_Gallery2-922a2fa5c68bc6d301e96eca68cccbe9c10331b0.tar.gz android_packages_apps_Gallery2-922a2fa5c68bc6d301e96eca68cccbe9c10331b0.tar.bz2 android_packages_apps_Gallery2-922a2fa5c68bc6d301e96eca68cccbe9c10331b0.zip | |
Gallery2: Upgrade works
Make it work on the new platform
Change-Id: I2d019f21bcb6da4e26fb671f23c5e1cef574bcd5
Diffstat (limited to 'src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java')
| -rw-r--r--[-rwxr-xr-x] | src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java b/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java index 41fd09c53..3365441e8 100755..100644 --- a/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java +++ b/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java @@ -371,6 +371,7 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr if (LOG) { Log.v(TAG, "surfaceCreated(" + holder + ")"); } + /* if (mCurrentState == STATE_SUSPENDED) { mSurfaceHolder = holder; mMediaPlayer.setDisplay(mSurfaceHolder); @@ -387,6 +388,7 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr release(false); } } + */ mSurfaceHolder = holder; openVideo(); } @@ -626,6 +628,7 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr if (LOG) { Log.v(TAG, "surfaceCreated(" + holder + ")"); } + /* if (mCurrentState == STATE_SUSPENDED) { mSurfaceHolder = holder; mMediaPlayer.setDisplay(mSurfaceHolder); @@ -642,6 +645,7 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr release(false); } } + */ mSurfaceHolder = holder; openVideo(); } @@ -774,6 +778,7 @@ 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) { if (mMediaPlayer.suspend()) { @@ -783,12 +788,14 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr } } } + */ release(false); } public void resume() { // 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 @@ -811,6 +818,7 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr return; } } + */ openVideo(); } |