ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 7b445a8e: Merge "Fix rotation in camera2 API" into klp-dev

Browse source 
* commit '7b445a8e3a21055a5735585ca0890d14977032f0':
  Fix rotation in camera2 API
This commit is contained in:
Mathias Agopian 2013-09-18 15:33:40 -07:00 • committed by Android Git Automerger
commit a512c1ca63
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/system/graphics.h
View file

@ -293,6 +293,8 @@ enum {
HAL_TRANSFORM_ROT_180 = 0x03, HAL_TRANSFORM_ROT_180 = 0x03,
/* rotate source image 270 degrees clockwise */ /* rotate source image 270 degrees clockwise */
HAL_TRANSFORM_ROT_270 = 0x07, HAL_TRANSFORM_ROT_270 = 0x07,
/* don't use. see system/window.h */
HAL_TRANSFORM_RESERVED = 0x08,
}; };
#ifdef __cplusplus #ifdef __cplusplus

5
include/system/window.h
View file

@ -296,12 +296,15 @@ enum {
NATIVE_WINDOW_TRANSFORM_FLIP_H = HAL_TRANSFORM_FLIP_H , NATIVE_WINDOW_TRANSFORM_FLIP_H = HAL_TRANSFORM_FLIP_H ,
/* flip source image vertically */ /* flip source image vertically */
NATIVE_WINDOW_TRANSFORM_FLIP_V = HAL_TRANSFORM_FLIP_V, 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, NATIVE_WINDOW_TRANSFORM_ROT_90 = HAL_TRANSFORM_ROT_90,
/* rotate source image 180 degrees */ /* rotate source image 180 degrees */
NATIVE_WINDOW_TRANSFORM_ROT_180 = HAL_TRANSFORM_ROT_180, NATIVE_WINDOW_TRANSFORM_ROT_180 = HAL_TRANSFORM_ROT_180,
/* rotate source image 270 degrees clock-wise */ /* rotate source image 270 degrees clock-wise */
NATIVE_WINDOW_TRANSFORM_ROT_270 = HAL_TRANSFORM_ROT_270, 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 */ /* parameter for NATIVE_WINDOW_SET_SCALING_MODE */