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

2 files changed, 19 insertions, 34 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 {
diff --git a/src/org/codeaurora/gallery3d/video/VideoSettingsActivity.java b/src/org/codeaurora/gallery3d/video/VideoSettingsActivity.java
index 32ccfe70f..caf140877 100644
--- a/src/org/codeaurora/gallery3d/video/VideoSettingsActivity.java
+++ b/src/org/codeaurora/gallery3d/video/VideoSettingsActivity.java
@@ -37,9 +37,11 @@ public class VideoSettingsActivity extends ListActivity {
     private String OPTION_NAME = "option_name";
     private String OPTION_DESC = "option_desc";
     private String DIALOG_TAG_SELECT_STEP_OPTION = "step_option_dialog";
-    private static int[] sStepOptionArray = null;
-    private static final int STEP_OPTION_THREE_SECOND = 0;
-    private static final int STEP_OPTION_SIX_SECOND = 1;
+
+    private static final int STEP_OPTION_DEFAULT = 10;
+    private static final int STEP_OPTION_ALTERNATE = 5;
+    private static int[] sStepOptionArray =  { STEP_OPTION_DEFAULT, STEP_OPTION_ALTERNATE };
+
     private static final String SELECTED_STEP_OPTION = "selected_step_option";
     private static final String VIDEO_PLAYER_DATA = "video_player_data";
     private int mSelectedStepOption = -1;
@@ -54,7 +56,7 @@ public class VideoSettingsActivity extends ListActivity {
         setContentView(R.layout.setting_list);
         ArrayList<HashMap<String, Object>> arrlist = new ArrayList<HashMap<String, Object>>(1);
         HashMap<String, Object> map = new HashMap<String, Object>();
-        map.put(OPTION_NAME, getString(R.string.setp_option_name));
+        map.put(OPTION_NAME, getString(R.string.step_option_name));
         map.put(OPTION_DESC, getString(R.string.step_option_desc));
         arrlist.add(map);
         SimpleAdapter adapter = new SimpleAdapter(this, arrlist, android.R.layout.simple_expandable_list_item_2,
@@ -94,7 +96,7 @@ public class VideoSettingsActivity extends ListActivity {
             FragmentManager fragmentManager = getFragmentManager();
             removeOldFragmentByTag(DIALOG_TAG_SELECT_STEP_OPTION);
             newFragment = StepOptionDialogFragment.newInstance(getStepOptionIDArray(),
-                    R.string.setp_option_name, mSelectedStepOption);
+                    R.string.step_option_name, mSelectedStepOption);
             ((StepOptionDialogFragment) newFragment).setOnClickListener(mStepOptionSelectedListener);
             newFragment.show(fragmentManager, DIALOG_TAG_SELECT_STEP_OPTION);
             break;
@@ -104,31 +106,17 @@ public class VideoSettingsActivity extends ListActivity {
     }
     
     private int[] getStepOptionIDArray() {
-        int[] stepOptionIDArray = new int[2];
-        stepOptionIDArray[STEP_OPTION_THREE_SECOND] = R.string.setp_option_three_second;
-        stepOptionIDArray[STEP_OPTION_SIX_SECOND] = R.string.setp_option_six_second;
-        sStepOptionArray  = new int[2];
-        sStepOptionArray[0] = STEP_OPTION_THREE_SECOND;
-        sStepOptionArray[1] = STEP_OPTION_SIX_SECOND;
-        return stepOptionIDArray;
+        return new int[] { R.string.step_option_default, R.string.step_option_alternate };
     }
 
     private DialogInterface.OnClickListener mStepOptionSelectedListener = new DialogInterface.OnClickListener() {
         @Override
         public void onClick(DialogInterface dialog, int whichItemSelect) {
-            setSelectedStepOption(whichItemSelect);
+            mSelectedStepOption = whichItemSelect;
             dialog.dismiss();
         }
     };
     
-    public void setSelectedStepOption(int which) {
-        mSelectedStepOption = getSelectedStepOption(which);
-    }
-    
-    static int getSelectedStepOption(int which) {
-        return sStepOptionArray[which];
-    }
-    
     /**
      * remove old DialogFragment
      * 
@@ -165,7 +153,7 @@ public class VideoSettingsActivity extends ListActivity {
         if (null == mPrefs) {
             mPrefs = getSharedPreferences(VIDEO_PLAYER_DATA, 0);
         }
-        mSelectedStepOption = mPrefs.getInt(SELECTED_STEP_OPTION, STEP_OPTION_THREE_SECOND);
+        mSelectedStepOption = mPrefs.getInt(SELECTED_STEP_OPTION, 0);
     }
 
     @Override
@@ -179,4 +167,10 @@ public class VideoSettingsActivity extends ListActivity {
         }
         return false;
     }
+
+    public static int getStepOptionValue(final Context context) {
+        final SharedPreferences mPrefs = context.getSharedPreferences(VIDEO_PLAYER_DATA, 0);
+        int selectedStepOption = mPrefs.getInt(SELECTED_STEP_OPTION, 0);
+        return sStepOptionArray[selectedStepOption] * 1000;
+    }
 }