summaryrefslogtreecommitdiffstats
path: root/include/hardware/camera3.h
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2013-03-06 13:21:11 -0800
committerEino-Ville Talvala <etalvala@google.com>2013-03-06 13:21:11 -0800
commit3a6e6b44324a7248123c4839b9a1dbffe8bd3439 (patch)
treea8db455938df27e4b3e3be9518c9385085c7bbc6 /include/hardware/camera3.h
parentfefb3343906fe73c827d1b9d50cb3c451602c514 (diff)
downloadhardware_libhardware-3a6e6b44324a7248123c4839b9a1dbffe8bd3439.zip
hardware_libhardware-3a6e6b44324a7248123c4839b9a1dbffe8bd3439.tar.gz
hardware_libhardware-3a6e6b44324a7248123c4839b9a1dbffe8bd3439.tar.bz2
Camera: Fix incorrect pointer types
- Array of streams given to configure_streams() must be an array of pointers to streams, to allow framework to fulfill stream structure lifetime guarantees. - buffer_handle_t needs extra level of indirection to match HAL1 & 2. Change-Id: Iee071da39218a748933c3dfa7bccb66fe92c05f1
Diffstat (limited to 'include/hardware/camera3.h')
-rw-r--r--include/hardware/camera3.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/hardware/camera3.h b/include/hardware/camera3.h
index 94a8e39..be0154f 100644
--- a/include/hardware/camera3.h
+++ b/include/hardware/camera3.h
@@ -508,8 +508,8 @@ typedef struct camera3_stream_configuration {
uint32_t num_streams;
/**
- * An array of camera streams, defining the input/output configuration for
- * the camera HAL device.
+ * An array of camera stream pointers, defining the input/output
+ * configuration for the camera HAL device.
*
* At most one input-capable stream may be defined (INPUT or BIDIRECTIONAL)
* in a single configuration.
@@ -517,7 +517,7 @@ typedef struct camera3_stream_configuration {
* At least one output-capable stream must be defined (OUTPUT or
* BIDIRECTIONAL).
*/
- camera3_stream_t *streams;
+ camera3_stream_t **streams;
} camera3_stream_configuration_t;
@@ -589,7 +589,7 @@ typedef struct camera3_stream_buffer_set {
* should inspect the passed-in buffers to determine any platform-private
* pixel format information.
*/
- buffer_handle_t *buffers;
+ buffer_handle_t **buffers;
} camera3_stream_buffer_set_t;