diff options
| author | Mathias Agopian <mathias@google.com> | 2013-09-17 23:48:54 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2013-09-17 23:48:54 -0700 |
| commit | 96675ed91ffe1ff95e7b10edf2b285f46b6f5213 (patch) | |
| tree | b97b51cab48e72fbcc36a38cda0dc011518436a8 | |
| parent | 3a0d4b34816d65e21951f44e4d98a954c5c855ae (diff) | |
| download | core-96675ed91ffe1ff95e7b10edf2b285f46b6f5213.tar.gz | |
Fix rotation in camera2 API
Bug: 10804238
Change-Id: I093945789d9c6d373392fc9dfd18ec2c6058d3b9
| -rw-r--r-- | include/system/graphics.h | 2 | ||||
| -rw-r--r-- | include/system/window.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/system/graphics.h b/include/system/graphics.h index 154f9cb4c..be86ae42b 100644 --- a/include/system/graphics.h +++ b/include/system/graphics.h @@ -293,6 +293,8 @@ enum { HAL_TRANSFORM_ROT_180 = 0x03, /* rotate source image 270 degrees clockwise */ HAL_TRANSFORM_ROT_270 = 0x07, + /* don't use. see system/window.h */ + HAL_TRANSFORM_RESERVED = 0x08, }; #ifdef __cplusplus diff --git a/include/system/window.h b/include/system/window.h index 7ce59e02f..649bd71fd 100644 --- a/include/system/window.h +++ b/include/system/window.h @@ -296,12 +296,15 @@ enum { NATIVE_WINDOW_TRANSFORM_FLIP_H = HAL_TRANSFORM_FLIP_H , /* flip source image vertically */ NATIVE_WINDOW_TRANSFORM_FLIP_V = HAL_TRANSFORM_FLIP_V, - /* rotate source image 90 degrees clock-wise */ + /* rotate source image 90 degrees clock-wise, and is applied after TRANSFORM_FLIP_{H|V} */ NATIVE_WINDOW_TRANSFORM_ROT_90 = HAL_TRANSFORM_ROT_90, /* rotate source image 180 degrees */ NATIVE_WINDOW_TRANSFORM_ROT_180 = HAL_TRANSFORM_ROT_180, /* rotate source image 270 degrees clock-wise */ NATIVE_WINDOW_TRANSFORM_ROT_270 = HAL_TRANSFORM_ROT_270, + /* transforms source by the inverse transform of the screen it is displayed onto. This + * transform is applied last */ + NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY = 0x08 }; /* parameter for NATIVE_WINDOW_SET_SCALING_MODE */ |