summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-02-13 02:40:26 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-02-13 02:40:26 -0800
commit7c08126209fd5581e6fa00769635fdcbe2c3e87c (patch)
tree11a77a6ca5b5c05d9c9b8e37c52179641008e656 /src
parentdec290216cb509d084e8d93db8481c4896aa8626 (diff)
parent9b1ab3613c9e22f45c7404d5a5acd6b24df4dce6 (diff)
downloadandroid_packages_apps_Gallery2-7c08126209fd5581e6fa00769635fdcbe2c3e87c.tar.gz
android_packages_apps_Gallery2-7c08126209fd5581e6fa00769635fdcbe2c3e87c.tar.bz2
android_packages_apps_Gallery2-7c08126209fd5581e6fa00769635fdcbe2c3e87c.zip
Merge "Gallery2: Enable Suspend/Resume"
Diffstat (limited to 'src')
-rwxr-xr-xsrc/org/codeaurora/gallery3d/video/CodeauroraVideoView.java41
1 files changed, 8 insertions, 33 deletions
diff --git a/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java b/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java
index e3f80f7b6..20d14f900 100755
--- a/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java
+++ b/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java
@@ -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;
}
}