Merge "Add BOARD_FIRST_CAMERA_FRONT_FACING betelgeuse (folio100) support" into gingerbread (c13bfa4c) · Commits · e / os / android_frameworks_base

media/java/android/media/CamcorderProfile.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -137,7 +137,7 @@ public class CamcorderProfile
		return get(i, quality);
		}
		}
		return null;
		return (numberOfCameras==1)?get(0, quality):null;
		}

		/**

+3 −0

Original line number	Diff line number	Diff line
		@@ -87,5 +87,8 @@ ifeq ($(BOARD_USE_CAF_LIBCAMERA), true)
		LOCAL_CFLAGS += -DBOARD_USE_CAF_LIBCAMERA
		endif

		ifeq ($(BOARD_FIRST_CAMERA_FRONT_FACING),true)
		LOCAL_CFLAGS += -DFIRST_CAMERA_FACING=CAMERA_FACING_FRONT -DFIRST_CAMERA_ORIENTATION=0
		endif

		include $(BUILD_SHARED_LIBRARY)

+10 −2

Original line number	Diff line number	Diff line
		@@ -1412,10 +1412,18 @@ status_t CameraService::dump(int fd, const Vector<String16>& args) {
		}

		#ifdef BOARD_USE_FROYO_LIBCAMERA

		#ifndef FIRST_CAMERA_FACING
		#define FIRST_CAMERA_FACING CAMERA_FACING_BACK
		#endif
		#ifndef FIRST_CAMERA_ORIENTATION
		#define FIRST_CAMERA_ORIENTATION 90
		#endif

		static const CameraInfo sCameraInfo[] = {
		{
		CAMERA_FACING_BACK,
		90, /* orientation */
		FIRST_CAMERA_FACING,
		FIRST_CAMERA_ORIENTATION, /* orientation */
		},
		{
		CAMERA_FACING_FRONT,