camera: Only change 720p preview dimensions for old userspace (cf997d01) · Commits · e / os / android_frameworks_base

services/camera/libcameraservice/CameraService.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,7 @@ static void setLogLevel(int level) {

		// ----------------------------------------------------------------------------

		#ifdef BOARD_USE_FROYO_LIBCAMERA
		struct camera_size_type {
		int width;
		int height;
		@@ -69,6 +70,7 @@ static const camera_size_type preview_sizes[] = {
		{ 1280, 720 }, // 720P
		{ 768, 432 },
		};
		#endif

		static int getCallingPid() {
		return IPCThreadState::self()->getCallingPid();
		@@ -572,12 +574,14 @@ status_t CameraService::Client::registerPreviewBuffers() {
		CameraParameters params(mHardware->getParameters());
		params.getPreviewSize(&w, &h);

		#ifdef BOARD_USE_FROYO_LIBCAMERA
		//for 720p recording , preview can be 800X448
		if(w == preview_sizes[0].width && h== preview_sizes[0].height){
		LOGD("registerpreviewbufs :changing dimensions to 768X432 for 720p recording.");
		w = preview_sizes[1].width;
		h = preview_sizes[1].height;
		}
		#endif

		// FIXME: don't use a hardcoded format here.
		ISurface::BufferHeap buffers(w, h, w, h,
		@@ -598,12 +602,14 @@ status_t CameraService::Client::setOverlay() {
		CameraParameters params(mHardware->getParameters());
		params.getPreviewSize(&w, &h);

		#ifdef BOARD_USE_FROYO_LIBCAMERA
		//for 720p recording , preview can be 800X448
		if(w == preview_sizes[0].width && h==preview_sizes[0].height){
		LOGD("Changing overlay dimensions to 768X432 for 720p recording.");
		w = preview_sizes[1].width;
		h = preview_sizes[1].height;
		}
		#endif

		if (w != mOverlayW \|\| h != mOverlayH \|\| mOrientationChanged) {
		// Force the destruction of any previous overlay