set more default CameraParameters

Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

3 files changed, 45 insertions, 10 deletions

diff --git a/libcamera/CameraHardware.cpp b/libcamera/CameraHardware.cpp
index 1d0fa06..884e6e0 100644
--- a/libcamera/CameraHardware.cpp
+++ b/libcamera/CameraHardware.cpp
@@ -484,11 +484,51 @@ status_t CameraHardware::setParameters(const CameraParameters& params)
     mParameters.setPreviewSize(w,h);
     mParameters.set(CameraParameters::KEY_SUPPORTED_PREVIEW_FPS_RANGE, supportedFpsRanges);
     mParameters.set(CameraParameters::KEY_SUPPORTED_PREVIEW_SIZES, "160x120,176x144,320x240,352x288,640x480");
-    mParameters.set("exposure-compensation-step", "0");
-    mParameters.set("focus-mode-values", "auto,macro");
-    mParameters.set("video-size-values", "160x120,176x144,320x240,352x288,640x480");
-    mParameters.set("preferred-preview-size-for-video", "640x480");
-    mParameters.set("preview-frame-rate-values", framerate);
+    mParameters.set(CameraParameters::KEY_SUPPORTED_PREVIEW_FORMATS, "yuv420p,yuv420sp");
+    mParameters.set(CameraParameters::KEY_EXPOSURE_COMPENSATION_STEP, "0");
+    mParameters.set(CameraParameters::KEY_SUPPORTED_FOCUS_MODES, "auto,macro");
+    mParameters.set(CameraParameters::KEY_SUPPORTED_VIDEO_SIZES, "160x120,176x144,320x240,352x288,640x480");
+    mParameters.set(CameraParameters::KEY_PREFERRED_PREVIEW_SIZE_FOR_VIDEO, "640x480");
+    mParameters.set(CameraParameters::KEY_PREVIEW_FRAME_RATE, framerate);
+    mParameters.set(CameraParameters::KEY_FOCAL_LENGTH, "0");
+    mParameters.set(CameraParameters::KEY_HORIZONTAL_VIEW_ANGLE, "170");
+
+    //mParameters.set(CameraParameters::PREVIEW_FORMAT, DEFAULT_PREVIEW_FORMAT);
+
+    //mParameters.set(CameraParameters::PICTURE_FORMAT, DEFAULT_PICTURE_FORMAT);
+    //mParameters.set(CameraParameters::PICTURE_SIZE, DEFAULT_PICTURE_SIZE);
+    //mParameters.set(CameraParameters::PREVIEW_SIZE, DEFAULT_PREVIEW_SIZE);
+    //mParameters.set(CameraParameters::PREVIEW_FRAME_RATE, DEFAULT_FRAMERATE);
+    //mParameters.set(CameraParameters::REQUIRED_PREVIEW_BUFS, DEFAULT_NUM_PREV_BUFS);
+    //mParameters.set(CameraParameters::KEY_FOCUS_MODE, DEFAULT_FOCUS_MODE);
+
+    //mParameters.set(CameraParameters::CAMERA_NAME, "USBCAMERA");
+    mParameters.set(CameraParameters::KEY_SUPPORTED_JPEG_THUMBNAIL_SIZES, "320x240");
+    mParameters.set(CameraParameters::KEY_JPEG_QUALITY, "90");
+    mParameters.set(CameraParameters::KEY_JPEG_THUMBNAIL_QUALITY, "50");
+    mParameters.set(CameraParameters::KEY_FOCAL_LENGTH, "0");
+    mParameters.set(CameraParameters::KEY_HORIZONTAL_VIEW_ANGLE, "170");
+    mParameters.set(CameraParameters::KEY_VERTICAL_VIEW_ANGLE, "170");
+    mParameters.set(CameraParameters::KEY_PREVIEW_FPS_RANGE, "30");
+    //mParameters.set(CameraParameters::S3D_PRV_FRAME_LAYOUT, "none");
+    //mParameters.set(CameraParameters::SUPPORTED_EXPOSURE_MODES, "auto");
+    //mParameters.set(CameraParameters::SUPPORTED_ISO_VALUES, "auto");
+    mParameters.set(CameraParameters::KEY_SUPPORTED_ANTIBANDING, "auto");
+    mParameters.set(CameraParameters::KEY_SUPPORTED_EFFECTS, "none");
+    //mParameters.set(CameraParameters::SUPPORTED_IPP_MODES, "ldc-nsf");
+    mParameters.set(CameraParameters::KEY_SUPPORTED_SCENE_MODES, "auto");
+    mParameters.set(CameraParameters::KEY_SUPPORTED_WHITE_BALANCE, "auto");
+    //mParameters.set(CameraParameters:FACING_INDEX, TICameraParameters::FACING_BACK);
+    //mParameters.set(CameraParameters::ORIENTATION_INDEX, 0);
+    //mParameters.set(CameraParameters::SENSOR_ORIENTATION, "0");
+    mParameters.set(CameraParameters::KEY_VIDEO_STABILIZATION, android::CameraParameters::FALSE);
+    //mParameters.set(CameraParameters::VNF, DEFAULT_VNF);
+
+    //For compatibility
+    mParameters.set(CameraParameters::KEY_ZOOM_RATIOS,"0");
+    mParameters.set(CameraParameters::KEY_MAX_ZOOM, "0");
+    mParameters.set(CameraParameters::KEY_ZOOM, "0");
+    mParameters.set(CameraParameters::KEY_ZOOM_SUPPORTED, "true");
 
     return NO_ERROR;
 }
diff --git a/libcamera/V4L2Camera.cpp b/libcamera/V4L2Camera.cpp
index 5e19777..a9d9504 100644
--- a/libcamera/V4L2Camera.cpp
+++ b/libcamera/V4L2Camera.cpp
@@ -14,11 +14,7 @@
 #include <fcntl.h>
 
 #include "V4L2Camera.h"
-
-extern "C" { /* Android jpeglib.h missed extern "C" */
 #include <jpeglib.h>
-     void convertYUYVtoRGB565(unsigned char *buf, unsigned char *rgb, int width, int height);
-}
 
 namespace android {
 
diff --git a/libcamera/V4L2Camera.h b/libcamera/V4L2Camera.h
index 8065bcc..b63de1a 100644
--- a/libcamera/V4L2Camera.h
+++ b/libcamera/V4L2Camera.h
@@ -73,7 +73,6 @@ private:
     int saveYUYVtoJPEG (unsigned char *inputBuffer, int width, int height, FILE *file, int quality);
 
     void convert(unsigned char *buf, unsigned char *rgb, int width, int height);
-    void yuv_to_rgb16(unsigned char y, unsigned char u, unsigned char v, unsigned char *rgb);
 };
 
 }; // namespace android