summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorLikai Ding <likaid@codeaurora.org>2014-02-21 11:22:32 +0800
committeremancebo <emancebo@cyngn.com>2014-09-04 10:40:18 -0700
commite6ba43eb21489a7876f6d5808340335ba275be8e (patch)
treeddb6579ccb347a4b97c72da3732e01edaf373a29 /src/com
parenta1fd9193d24c0d2f062357058fc363a6334c4033 (diff)
downloadandroid_packages_apps_Gallery2-e6ba43eb21489a7876f6d5808340335ba275be8e.tar.gz
android_packages_apps_Gallery2-e6ba43eb21489a7876f6d5808340335ba275be8e.tar.bz2
android_packages_apps_Gallery2-e6ba43eb21489a7876f6d5808340335ba275be8e.zip
MoviePlayer: fix streaming video stepping forward
The default forward/rewind step is 3/6 seconds, which falls short to reach another intra-frame. Change the default to 10 seconds. Also, some code clean-up is made. CRs-Fixed: 613577 Change-Id: I94bceb5cdac0904545ef58609855c8fb8d6aa05a
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/gallery3d/app/MoviePlayer.java15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java
index 54399260a..ae1af46f4 100644
--- a/src/com/android/gallery3d/app/MoviePlayer.java
+++ b/src/com/android/gallery3d/app/MoviePlayer.java
@@ -63,6 +63,7 @@ import org.codeaurora.gallery3d.video.IControllerRewindAndForward.IRewindAndForw
import org.codeaurora.gallery3d.video.ScreenModeManager;
import org.codeaurora.gallery3d.video.ScreenModeManager.ScreenModeListener;
import org.codeaurora.gallery3d.video.CodeauroraVideoView;
+import org.codeaurora.gallery3d.video.VideoSettingsActivity;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -1525,7 +1526,7 @@ public class MoviePlayer implements
mControllerRewindAndForwardExt.showControllerButtonsView(mPlayerExt
.canStop(),
false, false);
- int stepValue = getStepOptionValue();
+ int stepValue = VideoSettingsActivity.getStepOptionValue(mContext);
int targetDuration = mVideoView.getCurrentPosition()
- stepValue < 0 ? 0 : mVideoView.getCurrentPosition()
- stepValue;
@@ -1545,7 +1546,7 @@ public class MoviePlayer implements
mControllerRewindAndForwardExt.showControllerButtonsView(mPlayerExt
.canStop(),
false, false);
- int stepValue = getStepOptionValue();
+ int stepValue = VideoSettingsActivity.getStepOptionValue(mContext);
int targetDuration = mVideoView.getCurrentPosition()
+ stepValue > mVideoView.getDuration() ? mVideoView
.getDuration() : mVideoView.getCurrentPosition()
@@ -1559,16 +1560,6 @@ public class MoviePlayer implements
}
}
}
-
- public int getStepOptionValue() {
- final String slectedStepOption = "selected_step_option";
- final String videoPlayerData = "video_player_data";
- final int stepBase = 3000;
- final int stepOptionThreeSeconds = 0;
- SharedPreferences mPrefs = mContext.getSharedPreferences(
- videoPlayerData, 0);
- return (mPrefs.getInt(slectedStepOption, stepOptionThreeSeconds) + 1) * stepBase;
- }
}
class Bookmarker {