diff options
author | Mathias Agopian <mathias@google.com> | 2010-10-21 16:26:02 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 16:26:02 -0700 |
commit | 8f0c48b306f98ac572ecc3c0f64b8e38db6d01eb (patch) | |
tree | 439fb2a8af1defe105de3dacb718c58ddbc74e70 /include | |
parent | 9acb8a2030444c46f9c4fa55e1f6137058cf46f8 (diff) | |
parent | 04e410dac8a4e69cff7aaa78c2c0871ce0b027ca (diff) | |
download | frameworks_av-8f0c48b306f98ac572ecc3c0f64b8e38db6d01eb.zip frameworks_av-8f0c48b306f98ac572ecc3c0f64b8e38db6d01eb.tar.gz frameworks_av-8f0c48b306f98ac572ecc3c0f64b8e38db6d01eb.tar.bz2 |
am 0c636055: Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread
Merge commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4' into gingerbread-plus-aosp
* commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4':
Mirror the preview for front-facing cameras. do not merge
Diffstat (limited to 'include')
-rw-r--r-- | include/camera/Camera.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/camera/Camera.h b/include/camera/Camera.h index 964700b..e6d84ba 100644 --- a/include/camera/Camera.h +++ b/include/camera/Camera.h @@ -83,6 +83,18 @@ enum { enum { CAMERA_CMD_START_SMOOTH_ZOOM = 1, CAMERA_CMD_STOP_SMOOTH_ZOOM = 2, + // Set the clockwise rotation of preview display (setPreviewDisplay) in + // degrees. This affects the preview frames and the picture displayed after + // snapshot. This method is useful for portrait mode applications. Note that + // preview display of front-facing cameras is flipped horizontally before + // the rotation, that is, the image is reflected along the central vertical + // axis of the camera sensor. So the users can see themselves as looking + // into a mirror. + // + // This does not affect the order of byte array of CAMERA_MSG_PREVIEW_FRAME, + // CAMERA_MSG_VIDEO_FRAME, CAMERA_MSG_POSTVIEW_FRAME, CAMERA_MSG_RAW_IMAGE, + // or CAMERA_MSG_COMPRESSED_IMAGE. This is not allowed to be set during + // preview. CAMERA_CMD_SET_DISPLAY_ORIENTATION = 3, }; |