Merge tag 'camera.lnx.2.0-00015' into camera.lnx.3.0-dev

Merge tag 'camera.lnx.2.0-00015' into camera.lnx.3.0-dev

Change-Id: If0d8ae32c19e1292214bfe8dbb45a9582eda8829

4 files changed, 34 insertions, 3 deletions

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index d2e8ff1f8..08e341e72 100755..100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -1739,8 +1739,10 @@ public class CaptureModule implements CameraModule, PhotoController,
 
                 if (isClearSightOn()) {
                     if(i == getMainCameraId()) {
-                        ClearSightImageProcessor.getInstance().init(map, mPictureSize.getWidth(),
-                                mPictureSize.getHeight(), mActivity, mOnMediaSavedListener);
+//                        ClearSightImageProcessor.getInstance().init(map, mPictureSize.getWidth(),
+//                                mPictureSize.getHeight(), mActivity, mOnMediaSavedListener);
+                        ClearSightImageProcessor.getInstance().init(map, mActivity,
+                                mOnMediaSavedListener);
                         ClearSightImageProcessor.getInstance().setCallback(this);
                     }
                 } else {
diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java
index d3f0b5a96..8d732b73a 100644
--- a/src/com/android/camera/SettingsActivity.java
+++ b/src/com/android/camera/SettingsActivity.java
@@ -218,6 +218,7 @@ public class SettingsActivity extends PreferenceActivity {
         updatePreference(SettingsManager.KEY_VIDEO_HIGH_FRAME_RATE);
         updatePreference(SettingsManager.KEY_VIDEO_ENCODER);
         updatePreference(SettingsManager.KEY_ZOOM);
+        updatePictureSizePreferenceButton();
 
         Map<String, SettingsManager.Values> map = mSettingsManager.getValuesMap();
         Set<Map.Entry<String, SettingsManager.Values>> set = map.entrySet();
@@ -268,6 +269,15 @@ public class SettingsActivity extends PreferenceActivity {
         }
     }
 
+    private void updatePictureSizePreferenceButton() {
+        Preference picturePref =  findPreference(SettingsManager.KEY_PICTURE_SIZE);
+        String sceneMode = mSettingsManager.getValue(SettingsManager.KEY_SCENE_MODE);
+        if ( sceneMode != null && picturePref != null ){
+            int sceneModeInt = Integer.parseInt(sceneMode);
+            picturePref.setEnabled(sceneModeInt != SettingsManager.SCENE_MODE_DUAL_INT);
+        }
+    }
+
     private void updatePreference(String key) {
         ListPreference pref = (ListPreference) findPreference(key);
         if (pref != null) {
diff --git a/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java b/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java
index 1e50bb690..b2a81389d 100644
--- a/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java
+++ b/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java
@@ -84,6 +84,7 @@ import com.android.camera.MediaSaveService;
 import com.android.camera.MediaSaveService.OnMediaSavedListener;
 import com.android.camera.PhotoModule.NamedImages;
 import com.android.camera.PhotoModule.NamedImages.NamedEntity;
+import com.android.camera.SettingsManager;
 import com.android.camera.Storage;
 import com.android.camera.util.CameraUtil;
 
@@ -210,6 +211,17 @@ public class ClearSightImageProcessor {
         return mInstance;
     }
 
+    public void init(StreamConfigurationMap map,
+                     Context context, OnMediaSavedListener mediaListener) {
+        Size maxSize = findMaxOutputSize(map);
+        int maxWidth = maxSize.getWidth();
+        int maxHeight = maxSize.getHeight();
+        SettingsManager settingsManager = SettingsManager.getInstance();
+        settingsManager.setValue(SettingsManager.KEY_PICTURE_SIZE,
+                String.valueOf(maxWidth) + "x" + String.valueOf(maxHeight));
+        init(map, maxWidth, maxHeight, context, mediaListener);
+    }
+
     public void init(StreamConfigurationMap map, int width, int height,
             Context context, OnMediaSavedListener mediaListener) {
         Log.d(TAG, "init() start");
@@ -992,7 +1004,6 @@ public class ClearSightImageProcessor {
         }
 
         private void processClearSight(NamedEntity namedEntity) {
-            mImageEncodeHandler.obtainMessage(MSG_START_CAPTURE).sendToTarget();
 
             short encodeRequest = 0;
             /* In same case, timeout will reset ClearSightNativeEngine object, so fields
@@ -1383,6 +1394,7 @@ public class ClearSightImageProcessor {
         }
 
         private void generateDepthmap() {
+            mImageEncodeHandler.obtainMessage(MSG_START_CAPTURE).sendToTarget();
             GDepth.DepthMap depthMap = null;
             int[] size = new int[2];
             if ( mDDMNativeEngine.getDepthMapSize(size) ) {
diff --git a/src/org/codeaurora/snapcam/filter/DDMNativeEngine.java b/src/org/codeaurora/snapcam/filter/DDMNativeEngine.java
index b2b0a523d..c04452047 100644
--- a/src/org/codeaurora/snapcam/filter/DDMNativeEngine.java
+++ b/src/org/codeaurora/snapcam/filter/DDMNativeEngine.java
@@ -230,6 +230,9 @@ public class DDMNativeEngine {
         int stream_id;
         Rect crop;
         Rect roi_map;
+        int user_zoom;
+        int stream_zoom;
+        float scale_ratio;
 
        private CamStreamCropInfo(){}
 
@@ -256,6 +259,10 @@ public class DDMNativeEngine {
            roi_map.bottom = roi_map.top + buffer.getInt();
            camStreamCropInfo.roi_map = roi_map;
 
+           camStreamCropInfo.user_zoom = buffer.getInt();
+           camStreamCropInfo.stream_zoom = buffer.getInt();
+           camStreamCropInfo.scale_ratio = buffer.getFloat();
+
            return camStreamCropInfo;
        }
     }