OSDN > Developer > buivedemss > Chambre > frameworks-base > Commit

frameworks-base
Fork

Commit

modify the frame size of picture which original size is fixed to be 352*288

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

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

		@@ -47,6 +47,7 @@ CameraHardware::CameraHardware()
47	47	mPreviewHeap(0),
48	48	mRawHeap(0),
49	49	mPreviewFrameSize(0),
	50	+ mPictureFrameSize(0),
50	51	mRecordingFrameSize(0),
51	52	mRecordingCallback(0),
52	53	mRecordingCallbackCookie(0),

		@@ -75,7 +76,7 @@ void CameraHardware::initDefaultParameters()
75	76	p.setPreviewFrameRate(DEFAULT_FRAME_RATE);
76	77	p.setPreviewFormat("yuv422sp");
77	78	p.setPictureFormat("jpeg");
78		- p.setPictureSize(PREVIEW_WIDTH, PREVIEW_HEIGHT);
	79	+ p.setPictureSize(PICTURE_WIDTH, PICTURE_HEIGHT);
79	80
80	81	p.set("jpeg-quality", "100"); // maximum quality
81	82	p.set("picture-size-values", "1600x1200,1024x768,640x480,352x288");

		@@ -146,9 +147,9 @@ int CameraHardware::previewThread()
146	147	(unsigned char *) mPreviewHeap->getBase(),
147	148	PREVIEW_WIDTH, PREVIEW_HEIGHT);
148	149
149		- yuyv422_to_yuv420((unsigned char *)mRawHeap->getBase(),
	150	+ yuyv422_to_yuv420((unsigned char *)mRawPicHeap->getBase(),
150	151	(unsigned char *)mHeap->getBase(),
151		- PREVIEW_WIDTH, PREVIEW_HEIGHT);
	152	+ PICTURE_WIDTH, PICTURE_HEIGHT);
152	153	mPreviewCallback(mBuffer, mPreviewCallbackCookie);
153	154
154	155	if (UNLIKELY(mDebugFps)) {

		@@ -177,9 +178,10 @@ status_t CameraHardware::startPreview(preview_callback cb, void* user)
177	178	}
178	179
179	180	mPreviewFrameSize = PREVIEW_WIDTH * PREVIEW_HEIGHT * 2;
	181	+ mPictureFrameSize = PICTURE_WIDTH * PICTURE_HEIGHT * 2;// to verify the picture to preview
180	182
181		- mHeap = new MemoryHeapBase(mPreviewFrameSize);
182		- mBuffer = new MemoryBase(mHeap, 0, mPreviewFrameSize);
	183	+ mHeap = new MemoryHeapBase(mPictureFrameSize);
	184	+ mBuffer = new MemoryBase(mHeap, 0, mPictureFrameSize);
183	185
184	186	mPreviewHeap = new MemoryHeapBase(mPreviewFrameSize);
185	187	mPreviewBuffer = new MemoryBase(mPreviewHeap, 0, mPreviewFrameSize);

		@@ -190,6 +192,9 @@ status_t CameraHardware::startPreview(preview_callback cb, void* user)
190	192	mRawHeap = new MemoryHeapBase(mPreviewFrameSize);
191	193	mRawBuffer = new MemoryBase(mRawHeap, 0, mPreviewFrameSize);
192	194
	195	+ mRawPicHeap = new MemoryHeapBase(mPictureFrameSize);
	196	+ mRawPicBuffer = new MemoryBase(mRawPicHeap, 0, mPictureFrameSize);
	197	+
193	198	camera.Init();
194	199	camera.StartStreaming();
195	200

		@@ -314,7 +319,7 @@ int CameraHardware::pictureThread()
314	319	if (mShutterCallback)
315	320	mShutterCallback(mPictureCallbackCookie);
316	321
317		- camera.Open(VIDEO_DEVICE, PREVIEW_WIDTH, PREVIEW_HEIGHT, PIXEL_FORMAT);
	322	+ camera.Open(VIDEO_DEVICE, PICTURE_WIDTH, PICTURE_HEIGHT, PIXEL_FORMAT);
318	323	camera.Init();
319	324	camera.StartStreaming();
320	325

		@@ -389,7 +394,7 @@ status_t CameraHardware::setParameters(const CameraParameters& params)
389	394
390	395	// Set to fixed sizes
391	396	mParameters.setPreviewSize(PREVIEW_WIDTH, PREVIEW_HEIGHT);
392		- mParameters.setPictureSize(PREVIEW_WIDTH, PREVIEW_HEIGHT);
	397	+ mParameters.setPictureSize(PICTURE_WIDTH, PICTURE_HEIGHT);
393	398
394	399	return NO_ERROR;
395	400	}

--- a/camera/libcameraservice/CameraHardware.h

+++ b/camera/libcameraservice/CameraHardware.h

		@@ -100,6 +100,8 @@ private:
100	100
101	101	sp<MemoryHeapBase> mHeap; // format: 420
102	102	sp<MemoryBase> mBuffer;
	103	+ sp<MemoryHeapBase> mRawPicHeap; // format: 422
	104	+ sp<MemoryBase> mRawPicBuffer;
103	105
104	106	sp<MemoryHeapBase> mPreviewHeap; // format: 565
105	107	sp<MemoryBase> mPreviewBuffer;

		@@ -108,6 +110,7 @@ private:
108	110
109	111	bool mPreviewRunning;
110	112	int mPreviewFrameSize;
	113	+ int mPictureFrameSize;
111	114
112	115	shutter_callback mShutterCallback;
113	116	raw_callback mRawPictureCallback;