Add various supports in settings and capabilities.

1. View angles in capabilities.
2. Preview formats setting.
3. Photo formats setting.
4. Recording hint for video recording preview setting.
5. JPEG thumbnail size setting.

Change-Id: Ib8e33cf838859ae76a662fffcc496250ad85c203

1 files changed, 18 insertions, 0 deletions

diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
index 8e9d799..0cd8ede 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
@@ -38,6 +38,7 @@ import android.view.SurfaceHolder;
 import com.android.ex.camera2.portability.debug.Log;
 
 import java.io.IOException;
+import java.util.StringTokenizer;
 
 /**
  * A class to implement {@link CameraAgent} of the Android camera framework.
@@ -512,6 +513,7 @@ class AndroidCameraAgentImpl implements CameraAgent {
             } else {
                 mParamsToSet.setPreviewFrameRate(settings.getPreviewFrameRate());
             }
+            mParamsToSet.setPreviewFormat(settings.getCurrentPreviewFormat());
             mParamsToSet.setJpegQuality(settings.getPhotoJpegCompressionQuality());
             if (mCapabilities.supports(CameraCapabilities.Feature.ZOOM)) {
                 // Should use settings.getCurrentZoomRatio() instead here.
@@ -545,6 +547,10 @@ class AndroidCameraAgentImpl implements CameraAgent {
                             .setSceneMode(stringifier.stringify(settings.getCurrentSceneMode()));
                 }
             }
+            mParamsToSet.setRecordingHint(settings.isRecordingHintEnabled());
+            Size jpegThumbSize = settings.getExifThumbnailSize();
+            mParamsToSet.setJpegThumbnailSize(jpegThumbSize.width(), jpegThumbSize.height());
+            mParamsToSet.setPictureFormat(settings.getCurrentPhotoFormat());
 
             CameraSettings.GpsData gpsData = settings.getGpsData();
             if (gpsData == null) {
@@ -1032,6 +1038,18 @@ class AndroidCameraAgentImpl implements CameraAgent {
                 }
             });
         }
+
+        @Override
+        public String dumpDeviceSettings() {
+            String flattened = mParameters.flatten();
+            StringTokenizer tokenizer = new StringTokenizer(flattened, ";");
+            String dumpedSettings = new String();
+            while (tokenizer.hasMoreElements()) {
+                dumpedSettings += tokenizer.nextToken() + '\n';
+            }
+
+            return dumpedSettings;
+        }
     }
 
     private static class WaitDoneBundle {