summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhijun He <zhijunhe@google.com>2014-04-29 01:12:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-04-29 01:12:45 +0000
commit50965dc0eab45ce4609674aba5fe06445d13b816 (patch)
tree3136b0509194c41fdcf08e01cf7b5a1e74525b4b
parentcf61191774068ffeb00153c006fbf0a9ab612fcb (diff)
parent44a891518719c1efc1520baa0c5926bf62de3873 (diff)
downloadhardware_libhardware-50965dc0eab45ce4609674aba5fe06445d13b816.zip
hardware_libhardware-50965dc0eab45ce4609674aba5fe06445d13b816.tar.gz
hardware_libhardware-50965dc0eab45ce4609674aba5fe06445d13b816.tar.bz2
Merge "camera3: Update camera3_jpeg_blob_t for max jpeg size change"
-rw-r--r--include/hardware/camera3.h23
1 files changed, 12 insertions, 11 deletions
diff --git a/include/hardware/camera3.h b/include/hardware/camera3.h
index 4503885..6623dc7 100644
--- a/include/hardware/camera3.h
+++ b/include/hardware/camera3.h
@@ -1535,17 +1535,18 @@ typedef struct camera3_stream_buffer_set {
* Transport header for compressed JPEG buffers in output streams.
*
* To capture JPEG images, a stream is created using the pixel format
- * HAL_PIXEL_FORMAT_BLOB, and the static metadata field android.jpeg.maxSize is
- * used as the buffer size. Since compressed JPEG images are of variable size,
- * the HAL needs to include the final size of the compressed image using this
- * structure inside the output stream buffer. The JPEG blob ID field must be set
- * to CAMERA3_JPEG_BLOB_ID.
- *
- * Transport header should be at the end of the JPEG output stream buffer. That
- * means the jpeg_blob_id must start at byte[android.jpeg.maxSize -
- * sizeof(camera3_jpeg_blob)]. Any HAL using this transport header must
- * account for it in android.jpeg.maxSize. The JPEG data itself starts at
- * the beginning of the buffer and should be jpeg_size bytes long.
+ * HAL_PIXEL_FORMAT_BLOB. The buffer size for the stream is calculated by the
+ * framework, based on the static metadata field android.jpeg.maxSize. Since
+ * compressed JPEG images are of variable size, the HAL needs to include the
+ * final size of the compressed image using this structure inside the output
+ * stream buffer. The JPEG blob ID field must be set to CAMERA3_JPEG_BLOB_ID.
+ *
+ * Transport header should be at the end of the JPEG output stream buffer. That
+ * means the jpeg_blob_id must start at byte[buffer_size -
+ * sizeof(camera3_jpeg_blob)], where the buffer_size is the size of gralloc buffer.
+ * Any HAL using this transport header must account for it in android.jpeg.maxSize
+ * The JPEG data itself starts at the beginning of the buffer and should be
+ * jpeg_size bytes long.
*/
typedef struct camera3_jpeg_blob {
uint16_t jpeg_blob_id;