camera2-portability: Add support for previews using the camera2 API

At the moment, only SurfaceTextures (and not SurfaceViews/SurfaceHolders) are
supported. The tests still only cover Stringifier and IntegralStringifier.

Change-Id: Ie643c58f8383cd3b9f59c16e0b79239df0ca068d

1 files changed, 2 insertions, 239 deletions

diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java
index 28d1fd1..14fcaaa 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java
@@ -29,13 +29,13 @@ import java.util.List;
  */
 class AndroidCameraCapabilities extends CameraCapabilities {
 
-    private static Log.Tag TAG = new Log.Tag("AndroidCameraCapabilities");
+    private static Log.Tag TAG = new Log.Tag("AndCamCapabs");
 
     private FpsComparator mFpsComparator = new FpsComparator();
     private SizeComparator mSizeComparator = new SizeComparator();
 
     AndroidCameraCapabilities(Camera.Parameters p) {
-        super(new AndroidCameraCapabilityStringifier());
+        super(new Stringifier());
         mMaxExposureCompensation = p.getMaxExposureCompensation();
         mMinExposureCompensation = p.getMinExposureCompensation();
         mExposureCompensationStep = p.getExposureCompensationStep();
@@ -250,241 +250,4 @@ class AndroidCameraCapabilities extends CameraCapabilities {
                     size1.width() - size2.width());
         }
     }
-
-    private static class AndroidCameraCapabilityStringifier implements Stringifier {
-
-        @Override
-        public String stringify(FocusMode focus) {
-            if (focus == null) {
-                return null;
-            }
-
-            switch (focus) {
-                case AUTO:
-                    return Camera.Parameters.FOCUS_MODE_AUTO;
-                case CONTINUOUS_PICTURE:
-                    return Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE;
-                case CONTINUOUS_VIDEO:
-                    return Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO;
-                case EXTENDED_DOF:
-                    return Camera.Parameters.FOCUS_MODE_EDOF;
-                case FIXED:
-                    return Camera.Parameters.FOCUS_MODE_FIXED;
-                case INFINITY:
-                    return Camera.Parameters.FOCUS_MODE_INFINITY;
-                case MACRO:
-                    return Camera.Parameters.FOCUS_MODE_MACRO;
-            }
-            return null;
-        }
-
-        @Override
-        public FocusMode focusModeFromString(String val) {
-            if (val == null) {
-                return null;
-            }
-
-            if (Camera.Parameters.FOCUS_MODE_AUTO.equals(val)) {
-                return FocusMode.AUTO;
-            } else if (Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE.equals(val)) {
-                return FocusMode.CONTINUOUS_PICTURE;
-            } else if (Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO.equals(val)) {
-                return FocusMode.CONTINUOUS_VIDEO;
-            } else if (Camera.Parameters.FOCUS_MODE_EDOF.equals(val)) {
-                return FocusMode.EXTENDED_DOF;
-            } else if (Camera.Parameters.FOCUS_MODE_FIXED.equals(val)) {
-                return FocusMode.FIXED;
-            } else if (Camera.Parameters.FOCUS_MODE_INFINITY.equals(val)) {
-                return FocusMode.INFINITY;
-            } else if (Camera.Parameters.FOCUS_MODE_MACRO.equals(val)) {
-                return FocusMode.MACRO;
-            } else {
-                return null;
-            }
-        }
-
-        @Override
-        public String stringify(FlashMode flash) {
-            if (flash == null) {
-                return null;
-            }
-
-            switch (flash) {
-                case NO_FLASH:
-                    return null;
-                case AUTO:
-                    return Camera.Parameters.FLASH_MODE_AUTO;
-                case OFF:
-                    return Camera.Parameters.FLASH_MODE_OFF;
-                case ON:
-                    return Camera.Parameters.FLASH_MODE_ON;
-                case TORCH:
-                    return Camera.Parameters.FLASH_MODE_TORCH;
-                case RED_EYE:
-                    return Camera.Parameters.FLASH_MODE_RED_EYE;
-            }
-            return null;
-        }
-
-        @Override
-        public FlashMode flashModeFromString(String val) {
-            if (val == null) {
-                return FlashMode.NO_FLASH;
-            } else if (Camera.Parameters.FLASH_MODE_AUTO.equals(val)) {
-                return FlashMode.AUTO;
-            } else if (Camera.Parameters.FLASH_MODE_OFF.equals(val)) {
-                return FlashMode.OFF;
-            } else if (Camera.Parameters.FLASH_MODE_ON.equals(val)) {
-                return FlashMode.ON;
-            } else if (Camera.Parameters.FLASH_MODE_TORCH.equals(val)) {
-                return FlashMode.TORCH;
-            } else if (Camera.Parameters.FLASH_MODE_RED_EYE.equals(val)) {
-                return FlashMode.RED_EYE;
-            } else {
-                return null;
-            }
-        }
-
-        @Override
-        public String stringify(SceneMode scene) {
-            if (scene == null) {
-                return null;
-            }
-
-            switch (scene) {
-                case AUTO:
-                    return Camera.Parameters.SCENE_MODE_AUTO;
-                case ACTION:
-                    return Camera.Parameters.SCENE_MODE_ACTION;
-                case BARCODE:
-                    return Camera.Parameters.SCENE_MODE_BARCODE;
-                case BEACH:
-                    return Camera.Parameters.SCENE_MODE_BEACH;
-                case CANDLELIGHT:
-                    return Camera.Parameters.SCENE_MODE_CANDLELIGHT;
-                case FIREWORKS:
-                    return Camera.Parameters.SCENE_MODE_FIREWORKS;
-                case HDR:
-                    return Camera.Parameters.SCENE_MODE_HDR;
-                case LANDSCAPE:
-                    return Camera.Parameters.SCENE_MODE_LANDSCAPE;
-                case NIGHT:
-                    return Camera.Parameters.SCENE_MODE_NIGHT;
-                case NIGHT_PORTRAIT:
-                    return Camera.Parameters.SCENE_MODE_NIGHT_PORTRAIT;
-                case PARTY:
-                    return Camera.Parameters.SCENE_MODE_PARTY;
-                case PORTRAIT:
-                    return Camera.Parameters.SCENE_MODE_PORTRAIT;
-                case SNOW:
-                    return Camera.Parameters.SCENE_MODE_SNOW;
-                case SPORTS:
-                    return Camera.Parameters.SCENE_MODE_SPORTS;
-                case STEADYPHOTO:
-                    return Camera.Parameters.SCENE_MODE_STEADYPHOTO;
-                case SUNSET:
-                    return Camera.Parameters.SCENE_MODE_SUNSET;
-                case THEATRE:
-                    return Camera.Parameters.SCENE_MODE_THEATRE;
-            }
-            return null;
-        }
-
-        @Override
-        public SceneMode sceneModeFromString(String val) {
-            if (val == null) {
-                return SceneMode.NO_SCENE_MODE;
-            } else if (Camera.Parameters.SCENE_MODE_AUTO.equals(val)) {
-                return SceneMode.AUTO;
-            } else if (Camera.Parameters.SCENE_MODE_ACTION.equals(val)) {
-                return SceneMode.ACTION;
-            } else if (Camera.Parameters.SCENE_MODE_BARCODE.equals(val)) {
-                return SceneMode.BARCODE;
-            } else if (Camera.Parameters.SCENE_MODE_BEACH.equals(val)) {
-                return SceneMode.BEACH;
-            } else if (Camera.Parameters.SCENE_MODE_CANDLELIGHT.equals(val)) {
-                return SceneMode.CANDLELIGHT;
-            } else if (Camera.Parameters.SCENE_MODE_FIREWORKS.equals(val)) {
-                return SceneMode.FIREWORKS;
-            } else if (Camera.Parameters.SCENE_MODE_HDR.equals(val)) {
-                return SceneMode.HDR;
-            } else if (Camera.Parameters.SCENE_MODE_LANDSCAPE.equals(val)) {
-                return SceneMode.LANDSCAPE;
-            } else if (Camera.Parameters.SCENE_MODE_NIGHT.equals(val)) {
-                return SceneMode.NIGHT;
-            } else if (Camera.Parameters.SCENE_MODE_NIGHT_PORTRAIT.equals(val)) {
-                return SceneMode.NIGHT_PORTRAIT;
-            } else if (Camera.Parameters.SCENE_MODE_PARTY.equals(val)) {
-                return SceneMode.PARTY;
-            } else if (Camera.Parameters.SCENE_MODE_PORTRAIT.equals(val)) {
-                return SceneMode.PORTRAIT;
-            } else if (Camera.Parameters.SCENE_MODE_SNOW.equals(val)) {
-                return SceneMode.SNOW;
-            } else if (Camera.Parameters.SCENE_MODE_SPORTS.equals(val)) {
-                return SceneMode.SPORTS;
-            } else if (Camera.Parameters.SCENE_MODE_STEADYPHOTO.equals(val)) {
-                return SceneMode.STEADYPHOTO;
-            } else if (Camera.Parameters.SCENE_MODE_SUNSET.equals(val)) {
-                return SceneMode.SUNSET;
-            } else if (Camera.Parameters.SCENE_MODE_THEATRE.equals(val)) {
-                return SceneMode.THEATRE;
-            } else {
-                return null;
-            }
-        }
-
-        @Override
-        public String stringify(WhiteBalance wb) {
-            if (wb == null) {
-                return null;
-            }
-
-            switch (wb) {
-                case AUTO:
-                    return Camera.Parameters.WHITE_BALANCE_AUTO;
-                case CLOUDY_DAYLIGHT:
-                    return Camera.Parameters.WHITE_BALANCE_CLOUDY_DAYLIGHT;
-                case DAYLIGHT:
-                    return Camera.Parameters.WHITE_BALANCE_DAYLIGHT;
-                case FLUORESCENT:
-                    return Camera.Parameters.WHITE_BALANCE_FLUORESCENT;
-                case INCANDESCENT:
-                    return Camera.Parameters.WHITE_BALANCE_INCANDESCENT;
-                case SHADE:
-                    return Camera.Parameters.WHITE_BALANCE_SHADE;
-                case TWILIGHT:
-                    return Camera.Parameters.WHITE_BALANCE_TWILIGHT;
-                case WARM_FLUORESCENT:
-                    return Camera.Parameters.WHITE_BALANCE_WARM_FLUORESCENT;
-            }
-            return null;
-        }
-
-        @Override
-        public WhiteBalance whiteBalanceFromString(String val) {
-            if (val == null) {
-                return null;
-            }
-
-            if (Camera.Parameters.WHITE_BALANCE_AUTO.equals(val)) {
-                return WhiteBalance.AUTO;
-            } else if (Camera.Parameters.WHITE_BALANCE_CLOUDY_DAYLIGHT.equals(val)) {
-                return WhiteBalance.CLOUDY_DAYLIGHT;
-            } else if (Camera.Parameters.WHITE_BALANCE_DAYLIGHT.equals(val)) {
-                return WhiteBalance.DAYLIGHT;
-            } else if (Camera.Parameters.WHITE_BALANCE_FLUORESCENT.equals(val)) {
-                return WhiteBalance.FLUORESCENT;
-            } else if (Camera.Parameters.WHITE_BALANCE_INCANDESCENT.equals(val)) {
-                return WhiteBalance.INCANDESCENT;
-            } else if (Camera.Parameters.WHITE_BALANCE_SHADE.equals(val)) {
-                return WhiteBalance.SHADE;
-            } else if (Camera.Parameters.WHITE_BALANCE_TWILIGHT.equals(val)) {
-                return WhiteBalance.TWILIGHT;
-            } else if (Camera.Parameters.WHITE_BALANCE_WARM_FLUORESCENT.equals(val)) {
-                return WhiteBalance.WARM_FLUORESCENT;
-            } else {
-                return null;
-            }
-        }
-    }
 }