summaryrefslogtreecommitdiff
authorsimon.zheng <simon.zheng@amlogic.com>2011-11-30 15:05:14 (GMT)
committer simon.zheng <simon.zheng@amlogic.com>2011-11-30 15:05:14 (GMT)
commit8ef3e79dd1a5e71c52005792a8bf3420b5eedd59 (patch)
treef168c437f64d115b29b9c2d17de67ac9837d8c32
parentf9e38a19becf6274c0028ee2de4fc448a38451ca (diff)
downloadcamera-8ef3e79dd1a5e71c52005792a8bf3420b5eedd59.zip
camera-8ef3e79dd1a5e71c52005792a8bf3420b5eedd59.tar.gz
camera-8ef3e79dd1a5e71c52005792a8bf3420b5eedd59.tar.bz2
add default video format
Diffstat
-rw-r--r--CameraHal.cpp2
-rw-r--r--V4LCameraAdapter/V4LCameraAdapter.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/CameraHal.cpp b/CameraHal.cpp
index 91c4369..535ecc3 100644
--- a/CameraHal.cpp
+++ b/CameraHal.cpp
@@ -3358,7 +3358,7 @@ void CameraHal::initDefaultParameters()
p.set(TICameraParameters::KEY_EXIF_MAKE, mCameraProperties->get(CameraProperties::EXIF_MAKE));
p.set(TICameraParameters::KEY_EXIF_MODEL, mCameraProperties->get(CameraProperties::EXIF_MODEL));
p.set(CameraParameters::KEY_JPEG_THUMBNAIL_QUALITY, mCameraProperties->get(CameraProperties::JPEG_THUMBNAIL_QUALITY));
- p.set(CameraParameters::KEY_VIDEO_FRAME_FORMAT, "OMX_TI_COLOR_FormatYUV420PackedSemiPlanar");
+ p.set(CameraParameters::KEY_VIDEO_FRAME_FORMAT, (const char *) CameraParameters::PIXEL_FORMAT_YUV420SP);
p.set(CameraParameters::KEY_MAX_NUM_DETECTED_FACES_HW, mCameraProperties->get(CameraProperties::MAX_FD_HW_FACES));
p.set(CameraParameters::KEY_MAX_NUM_DETECTED_FACES_SW, mCameraProperties->get(CameraProperties::MAX_FD_SW_FACES));
diff --git a/V4LCameraAdapter/V4LCameraAdapter.cpp b/V4LCameraAdapter/V4LCameraAdapter.cpp
index b2ab198..1986fe0 100644
--- a/V4LCameraAdapter/V4LCameraAdapter.cpp
+++ b/V4LCameraAdapter/V4LCameraAdapter.cpp
@@ -686,7 +686,7 @@ int V4LCameraAdapter::previewThread()
mParams.getPreviewSize(&width, &height);
frame.mFrameMask = CameraFrame::PREVIEW_FRAME_SYNC;
- //frame.mFrameType = CameraFrame::PREVIEW_FRAME_SYNC;
+ frame.mFrameType = CameraFrame::PREVIEW_FRAME_SYNC;
frame.mBuffer = ptr; //dest
frame.mLength = width*height*2;
frame.mAlignment = width*2;
@@ -1062,7 +1062,7 @@ extern "C" void loadCaps(int camera_id, CameraProperties::Properties* params) {
params->set(CameraProperties::SUPPORTED_SCENE_MODES, "auto");
params->set(CameraProperties::SUPPORTED_FLASH_MODES, "off");
params->set(CameraProperties::SUPPORTED_EFFECTS, "none");
- params->set(CameraProperties::SUPPORTED_VIDEO_SIZES, "352x288,648x480");
+ params->set(CameraProperties::SUPPORTED_VIDEO_SIZES, "352x288,640x480");
}