summaryrefslogtreecommitdiffstats
path: root/include/camera/Camera.h
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2010-11-19 19:20:59 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-19 19:20:59 -0800
commitd8f4d4a919fb4fa6bbd405d03dc91f079c3c2e37 (patch)
treef78c215b7bc4dcccb17827ceec3d77c0096d7b9b /include/camera/Camera.h
parent8a674dcc94936e2306121016ab258b4c00cc9d98 (diff)
parent42005680c0817a786f07712ffa359f0883944120 (diff)
downloadframeworks_av-d8f4d4a919fb4fa6bbd405d03dc91f079c3c2e37.zip
frameworks_av-d8f4d4a919fb4fa6bbd405d03dc91f079c3c2e37.tar.gz
frameworks_av-d8f4d4a919fb4fa6bbd405d03dc91f079c3c2e37.tar.bz2
am fb6f4505: am 589e8381: Merge "Improve camera documentation." into gingerbread
* commit 'fb6f4505ba5c227cebb73f1269b0af5d92e6e5e6': Improve camera documentation.
Diffstat (limited to 'include/camera/Camera.h')
-rw-r--r--include/camera/Camera.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/include/camera/Camera.h b/include/camera/Camera.h
index 8d8edd6..c7f0b15 100644
--- a/include/camera/Camera.h
+++ b/include/camera/Camera.h
@@ -111,8 +111,8 @@ enum {
};
enum {
- CAMERA_FACING_BACK = 0,
- CAMERA_FACING_FRONT = 1 /* The camera faces to the user */
+ CAMERA_FACING_BACK = 0, /* The facing of the camera is opposite to that of the screen. */
+ CAMERA_FACING_FRONT = 1 /* The facing of the camera is the same as that of the screen. */
};
struct CameraInfo {
@@ -128,10 +128,12 @@ struct CameraInfo {
* camera image needs to be rotated clockwise so it shows correctly on
* the display in its natural orientation. It should be 0, 90, 180, or 270.
*
- * For example, suppose a device has a naturally tall screen, but the camera
- * sensor is mounted in landscape. If the top side of the camera sensor is
- * aligned with the right edge of the display in natural orientation, the
- * value should be 90.
+ * For example, suppose a device has a naturally tall screen. The
+ * back-facing camera sensor is mounted in landscape. You are looking at
+ * the screen. If the top side of the camera sensor is aligned with the
+ * right edge of the screen in natural orientation, the value should be
+ * 90. If the top side of a front-facing camera sensor is aligned with
+ * the right of the screen, the value should be 270.
*/
int orientation;
};