4 files changed, 11 insertions, 18 deletions
diff --git a/camera/inc/CameraHal.h b/camera/inc/CameraHal.h
index aaea2a7..e44c1b6 100644
--- a/camera/inc/CameraHal.h
+++ b/camera/inc/CameraHal.h
@@ -985,21 +985,6 @@ public:
     void        releaseRecordingFrame(const void *opaque);
 
     /**
-     * Set the camera parameters specific to Video Recording.
-     */
-    bool        setVideoModeParameters();
-
-    /**
-     * Reset the camera parameters specific to Video Recording.
-     */
-    bool       resetVideoModeParameters();
-
-    /**
-     * Restart the preview with setParameter.
-     */
-    status_t        restartPreview();
-
-    /**
      * Start auto focus, the notification callback routine is called
      * with CAMERA_MSG_FOCUS once when focusing is complete. autoFocus()
      * will be called again if another auto focus is needed.
@@ -1100,6 +1085,15 @@ private:
     /** @name internalFunctionsPrivate */
     //@{
 
+    /**  Set the camera parameters specific to Video Recording. */
+    bool        setVideoModeParameters(const CameraParameters&);
+
+    /** Reset the camera parameters specific to Video Recording. */
+    bool       resetVideoModeParameters();
+
+    /** Restart the preview with setParameter. */
+    status_t        restartPreview();
+
     status_t parseResolution(const char *resStr, int &width, int &height);
 
     void insertSupportedParams();
diff --git a/camera/inc/CameraProperties.h b/camera/inc/CameraProperties.h
index 7b9dbd2..a220af7 100644
--- a/camera/inc/CameraProperties.h
+++ b/camera/inc/CameraProperties.h
@@ -118,7 +118,7 @@ public:
     static const char S3D2D_PREVIEW[];
     static const char S3D2D_PREVIEW_MODES[];
     static const char VSTAB[];
-    static const char VSTAB_VALUES[];
+    static const char VSTAB_SUPPORTED[];
     static const char FRAMERATE_RANGE[];
     static const char FRAMERATE_RANGE_IMAGE[];
     static const char FRAMERATE_RANGE_VIDEO[];
diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
index 9f938be..4b82109 100644
--- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
+++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
@@ -732,6 +732,7 @@ private:
     static const char DEFAULT_SCENE_MODE[];
     static const char DEFAULT_SHARPNESS[];
     static const char DEFAULT_VSTAB[];
+    static const char DEFAULT_VSTAB_SUPPORTED[];
     static const char DEFAULT_WB[];
     static const char DEFAULT_ZOOM[];
     static const char DEFAULT_MAX_FD_HW_FACES[];
diff --git a/camera/inc/TICameraParameters.h b/camera/inc/TICameraParameters.h
index 1886d0c..e01b38d 100644
--- a/camera/inc/TICameraParameters.h
+++ b/camera/inc/TICameraParameters.h
@@ -39,8 +39,6 @@ static const char KEY_CAMERA_NAME[];
 static const  char KEY_S3D_SUPPORTED[];
 static const char  KEY_BURST[];
 static const  char KEY_CAP_MODE[];
-static const  char KEY_VSTAB[];
-static const  char KEY_VSTAB_VALUES[];
 static const  char KEY_VNF[];
 static const  char KEY_SATURATION[];
 static const  char KEY_BRIGHTNESS[];