summaryrefslogtreecommitdiff
authorbrian.zhu <brian.zhu@amlogic.com>2013-01-11 08:17:11 (GMT)
committer brian.zhu <brian.zhu@amlogic.com>2013-01-11 08:17:11 (GMT)
commitafd0e710244774d1b67032694da4d7142d001de7 (patch)
treecfc2b252dbca3241423330e7a9f158291b854c34
parent937439ec6eb8d36fb2d19a4c497711e6b4dc0f5e (diff)
downloadcamera-afd0e710244774d1b67032694da4d7142d001de7.zip
camera-afd0e710244774d1b67032694da4d7142d001de7.tar.gz
camera-afd0e710244774d1b67032694da4d7142d001de7.tar.bz2
use software resize for thumbnail, change thumbnail to 160x120
Diffstat
-rwxr-xr-xV4LCameraAdapter/V4LCameraAdapter.cpp4
-rwxr-xr-xinc/V4LCameraAdapter/V4LCameraAdapter.h6
2 files changed, 6 insertions, 4 deletions
diff --git a/V4LCameraAdapter/V4LCameraAdapter.cpp b/V4LCameraAdapter/V4LCameraAdapter.cpp
index 7555bdc..1822ffe 100755
--- a/V4LCameraAdapter/V4LCameraAdapter.cpp
+++ b/V4LCameraAdapter/V4LCameraAdapter.cpp
@@ -2740,8 +2740,8 @@ extern "C" void loadCaps(int camera_id, CameraProperties::Properties* params) {
params->set(CameraProperties::JPEG_QUALITY, 90);
//must have >2 sizes and contain "0x0"
- params->set(CameraProperties::SUPPORTED_THUMBNAIL_SIZES, "180x160,0x0");
- params->set(CameraProperties::JPEG_THUMBNAIL_SIZE, "180x160");
+ params->set(CameraProperties::SUPPORTED_THUMBNAIL_SIZES, "160x120,0x0");
+ params->set(CameraProperties::JPEG_THUMBNAIL_SIZE, "160x120");
params->set(CameraProperties::JPEG_THUMBNAIL_QUALITY, 90);
//get & set picture size
diff --git a/inc/V4LCameraAdapter/V4LCameraAdapter.h b/inc/V4LCameraAdapter/V4LCameraAdapter.h
index 40da2be..759fef9 100755
--- a/inc/V4LCameraAdapter/V4LCameraAdapter.h
+++ b/inc/V4LCameraAdapter/V4LCameraAdapter.h
@@ -30,10 +30,12 @@ namespace android {
//#define AMLOGIC_UVC_320X240
#define DEFAULT_PREVIEW_PIXEL_FORMAT V4L2_PIX_FMT_NV21
//#define DEFAULT_PREVIEW_PIXEL_FORMAT V4L2_PIX_FMT_YUYV
-#define DEFAULT_IMAGE_CAPTURE_PIXEL_FORMAT V4L2_PIX_FMT_RGB24
+//#define DEFAULT_IMAGE_CAPTURE_PIXEL_FORMAT V4L2_PIX_FMT_RGB24
+#define DEFAULT_IMAGE_CAPTURE_PIXEL_FORMAT V4L2_PIX_FMT_NV21
#else
#define DEFAULT_PREVIEW_PIXEL_FORMAT V4L2_PIX_FMT_NV21
-#define DEFAULT_IMAGE_CAPTURE_PIXEL_FORMAT V4L2_PIX_FMT_RGB24
+//#define DEFAULT_IMAGE_CAPTURE_PIXEL_FORMAT V4L2_PIX_FMT_RGB24
+#define DEFAULT_IMAGE_CAPTURE_PIXEL_FORMAT V4L2_PIX_FMT_NV21
#endif
#define NB_BUFFER 6