From e6ba43eb21489a7876f6d5808340335ba275be8e Mon Sep 17 00:00:00 2001
From: Likai Ding <likaid@codeaurora.org>
Date: Fri, 21 Feb 2014 11:22:32 +0800
Subject: 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
---
 src/com/android/gallery3d/app/MoviePlayer.java | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'src/com')

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 {
-- 
cgit v1.2.3