OSDN > Developer > hafixie93 > Chamber > frameworks-base > Commit

frameworks-base
Fork

Fork origin: android-x86 / frameworks-base

R/O
HTTP
SSH
HTTPS

Commit

Tags

No Tags

frameworks/base

Commit MetaInfo

Revision	5933ae56b1668111be7e24207cd5bdd60e3d4bd5 (tree)
Time	2011-02-11 11:31:22
Author	Chih-Wei Huang <cwhuang@linu...>
Commiter	Chih-Wei Huang

Log Message

camera: define CAM_SIZE

Change Summary

modified: camera/libcameraservice/CameraHardware.cpp (diff)

Incremental Difference

--- a/camera/libcameraservice/CameraHardware.cpp

+++ b/camera/libcameraservice/CameraHardware.cpp

		@@ -28,6 +28,7 @@
28	28	#define VIDEO_DEVICE "/dev/video0"
29	29	#define MIN_WIDTH 640
30	30	#define MIN_HEIGHT 480
	31	+#define CAM_SIZE "640x480"
31	32	#define PIXEL_FORMAT V4L2_PIX_FMT_YUYV
32	33
33	34	namespace android {

		@@ -61,11 +62,11 @@ void CameraHardware::initDefaultParameters()
61	62	p.setPreviewSize(MIN_WIDTH, MIN_HEIGHT);
62	63	p.setPreviewFrameRate(15);
63	64	p.setPreviewFormat("yuv422sp");
64		- p.set(p.KEY_SUPPORTED_PREVIEW_SIZES, "640x480");
	65	+ p.set(p.KEY_SUPPORTED_PREVIEW_SIZES, CAM_SIZE);
65	66
66	67	p.setPictureSize(MIN_WIDTH, MIN_HEIGHT);
67	68	p.setPictureFormat("jpeg");
68		- p.set(p.KEY_SUPPORTED_PICTURE_SIZES, "640x480");
	69	+ p.set(p.KEY_SUPPORTED_PICTURE_SIZES, CAM_SIZE);
69	70
70	71	if (setParameters(p) != NO_ERROR) {
71	72	LOGE("Failed to set default parameters?!");