summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-07-17 23:37:19 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-07-17 23:37:19 -0700
commit9e44c4f19821acf3022ca87d5c36f5f79cfad539 (patch)
tree0ee603fecd677087888afbe8f0c0361fbc7ed594
parent15c9d3af0d8bfb8afe6fb89b420746a139336f0f (diff)
parent49b02f75eba649d696813bbfaeb87658d0e5b6c3 (diff)
downloadlibhardware-9e44c4f19821acf3022ca87d5c36f5f79cfad539.tar.gz
Merge change 5893
* changes: Color Format and Overlay Functions
-rw-r--r--include/hardware/hardware.h4
-rw-r--r--include/hardware/overlay.h17
2 files changed, 19 insertions, 2 deletions
diff --git a/include/hardware/hardware.h b/include/hardware/hardware.h
index c8dc6f6f..27a4156b 100644
--- a/include/hardware/hardware.h
+++ b/include/hardware/hardware.h
@@ -130,7 +130,9 @@ enum {
HAL_PIXEL_FORMAT_YCbCr_422_P = 0x12,
HAL_PIXEL_FORMAT_YCbCr_420_P = 0x13,
HAL_PIXEL_FORMAT_YCbCr_422_I = 0x14,
- HAL_PIXEL_FORMAT_YCbCr_420_I = 0x15
+ HAL_PIXEL_FORMAT_YCbCr_420_I = 0x15,
+ HAL_PIXEL_FORMAT_CbYCrY_422_I = 0x16,
+ HAL_PIXEL_FORMAT_CbYCrY_420_I = 0x17
};
diff --git a/include/hardware/overlay.h b/include/hardware/overlay.h
index 92992d18..be5cbdf6 100644
--- a/include/hardware/overlay.h
+++ b/include/hardware/overlay.h
@@ -46,7 +46,13 @@ enum {
OVERLAY_FORMAT_RGB_565 = HAL_PIXEL_FORMAT_RGB_565,
OVERLAY_FORMAT_BGRA_8888 = HAL_PIXEL_FORMAT_BGRA_8888,
OVERLAY_FORMAT_YCbCr_422_I = HAL_PIXEL_FORMAT_YCbCr_422_I,
- OVERLAY_FORMAT_YCbCr_420_I = HAL_PIXEL_FORMAT_YCbCr_420_I
+ OVERLAY_FORMAT_YCbCr_420_I = HAL_PIXEL_FORMAT_YCbCr_420_I,
+ OVERLAY_FORMAT_YCbCr_422_SP = HAL_PIXEL_FORMAT_YCbCr_422_SP,
+ OVERLAY_FORMAT_YCbCr_420_SP = HAL_PIXEL_FORMAT_YCbCr_420_SP,
+ OVERLAY_FORMAT_YCbYCr_422_I = HAL_PIXEL_FORMAT_YCbCr_422_I,
+ OVERLAY_FORMAT_YCbYCr_420_I = HAL_PIXEL_FORMAT_YCbCr_420_I,
+ OVERLAY_FORMAT_CbYCrY_422_I = HAL_PIXEL_FORMAT_CbYCrY_422_I,
+ OVERLAY_FORMAT_CbYCrY_420_I = HAL_PIXEL_FORMAT_CbYCrY_420_I
};
/* values for copybit_set_parameter(OVERLAY_TRANSFORM) */
@@ -169,6 +175,9 @@ struct overlay_control_device_t {
* supported. */
int (*setParameter)(struct overlay_control_device_t *dev,
overlay_t* overlay, int param, int value);
+
+ int (*stage)(struct overlay_control_device_t *dev, overlay_t* overlay);
+ int (*commit)(struct overlay_control_device_t *dev, overlay_t* overlay);
};
@@ -180,6 +189,12 @@ struct overlay_data_device_t {
int (*initialize)(struct overlay_data_device_t *dev,
overlay_handle_t handle);
+ int (*setCrop)(struct overlay_data_device_t *dev,
+ uint32_t x, uint32_t y, uint32_t w, uint32_t h) ;
+
+ int (*getCrop)(struct overlay_data_device_t *dev,
+ uint32_t* x, uint32_t* y, uint32_t* w, uint32_t* h) ;
+
/* blocks until an overlay buffer is available and return that buffer. */
int (*dequeueBuffer)(struct overlay_data_device_t *dev,
overlay_buffer_t *buf);