summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-02-13 12:57:52 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2009-02-13 12:57:52 -0800
commita5d999ff17a84a33e9761eab958eac0267748aa9 (patch)
tree04fa49b15acc4160613fa11e7a35c3295bc7962c
parentb376203efb29c5f86ad8c8d40e90b74756669a1c (diff)
downloadlibhardware-a5d999ff17a84a33e9761eab958eac0267748aa9.tar.gz
auto import from //branches/cupcake/...@131421
-rw-r--r--include/hardware/copybit.h10
-rw-r--r--include/hardware/hardware.h18
-rw-r--r--include/hardware/overlay.h10
3 files changed, 28 insertions, 10 deletions
diff --git a/include/hardware/copybit.h b/include/hardware/copybit.h
index 15b5ebee..7774cd26 100644
--- a/include/hardware/copybit.h
+++ b/include/hardware/copybit.h
@@ -63,15 +63,15 @@ enum {
/* values for copybit_set_parameter(COPYBIT_TRANSFORM) */
enum {
/* flip source image horizontally */
- COPYBIT_TRANSFORM_FLIP_H = 0x01,
+ COPYBIT_TRANSFORM_FLIP_H = HAL_TRANSFORM_FLIP_H,
/* flip source image vertically */
- COPYBIT_TRANSFORM_FLIP_V = 0x02,
+ COPYBIT_TRANSFORM_FLIP_V = HAL_TRANSFORM_FLIP_V,
/* rotate source image 90 degres */
- COPYBIT_TRANSFORM_ROT_90 = 0x04,
+ COPYBIT_TRANSFORM_ROT_90 = HAL_TRANSFORM_ROT_90,
/* rotate source image 180 degres */
- COPYBIT_TRANSFORM_ROT_180 = 0x03,
+ COPYBIT_TRANSFORM_ROT_180 = HAL_TRANSFORM_ROT_180,
/* rotate source image 270 degres */
- COPYBIT_TRANSFORM_ROT_270 = 0x07,
+ COPYBIT_TRANSFORM_ROT_270 = HAL_TRANSFORM_ROT_270,
};
/* enable/disable value copybit_set_parameter */
diff --git a/include/hardware/hardware.h b/include/hardware/hardware.h
index e4806750..53257442 100644
--- a/include/hardware/hardware.h
+++ b/include/hardware/hardware.h
@@ -125,6 +125,24 @@ enum {
HAL_PIXEL_FORMAT_YCbCr_420_I = 0x15
};
+
+/**
+ * Transformation definitions
+ */
+
+enum {
+ /* flip source image horizontally */
+ HAL_TRANSFORM_FLIP_H = 0x01,
+ /* flip source image vertically */
+ HAL_TRANSFORM_FLIP_V = 0x02,
+ /* rotate source image 90 degres */
+ HAL_TRANSFORM_ROT_90 = 0x04,
+ /* rotate source image 180 degres */
+ HAL_TRANSFORM_ROT_180 = 0x03,
+ /* rotate source image 270 degres */
+ HAL_TRANSFORM_ROT_270 = 0x07,
+};
+
__END_DECLS
#endif /* ANDROID_INCLUDE_HARDWARE_HARDWARE_H */
diff --git a/include/hardware/overlay.h b/include/hardware/overlay.h
index c5d43cbb..92992d18 100644
--- a/include/hardware/overlay.h
+++ b/include/hardware/overlay.h
@@ -52,15 +52,15 @@ enum {
/* values for copybit_set_parameter(OVERLAY_TRANSFORM) */
enum {
/* flip source image horizontally */
- OVERLAY_TRANSFORM_FLIP_H = 0x01,
+ OVERLAY_TRANSFORM_FLIP_H = HAL_TRANSFORM_FLIP_V,
/* flip source image vertically */
- OVERLAY_TRANSFORM_FLIP_V = 0x02,
+ OVERLAY_TRANSFORM_FLIP_V = HAL_TRANSFORM_FLIP_H,
/* rotate source image 90 degrees */
- OVERLAY_TRANSFORM_ROT_90 = 0x04,
+ OVERLAY_TRANSFORM_ROT_90 = HAL_TRANSFORM_ROT_90,
/* rotate source image 180 degrees */
- OVERLAY_TRANSFORM_ROT_180 = 0x03,
+ OVERLAY_TRANSFORM_ROT_180 = HAL_TRANSFORM_ROT_180,
/* rotate source image 270 degrees */
- OVERLAY_TRANSFORM_ROT_270 = 0x07,
+ OVERLAY_TRANSFORM_ROT_270 = HAL_TRANSFORM_ROT_270
};
/* names for setParameter() */