mm-camera-interface: Update raw stream offset calculation
Strides should represent offset in bytes, not in pixels.
Bug: 14395767
Change-Id: I515bf82627f64499bd41b687be1039c053f40a7d
diff --git a/camera/QCamera2/HAL3/QCamera3Channel.cpp b/camera/QCamera2/HAL3/QCamera3Channel.cpp
index 22e75b3..7c99bca 100644
--- a/camera/QCamera2/HAL3/QCamera3Channel.cpp
+++ b/camera/QCamera2/HAL3/QCamera3Channel.cpp
@@ -907,11 +907,11 @@
memset(&offset, 0, sizeof(cam_frame_len_offset_t));
stream->getFrameOffset(offset);
snprintf(buf, sizeof(buf), "/data/r_%d_%dx%d.raw",
- frame->frame_idx, offset.mp[0].stride, offset.mp[0].scanline);
+ frame->frame_idx, dim.width, dim.height);
int file_fd = open(buf, O_RDWR| O_CREAT, 0777);
if (file_fd) {
- int written_len = write(file_fd, frame->buffer, frame->frame_len);
+ int written_len = write(file_fd, frame->buffer, offset.frame_len);
ALOGE("%s: written number of bytes %d", __func__, written_len);
close(file_fd);
} else {
@@ -949,7 +949,7 @@
// 2. Opaque raw10's stride is 6 pixels, and aligned to 16 bytes.
for (int y = dim.height-1; y >= 0; y--) {
uint64_t* row_start = (uint64_t *)frame->buffer +
- y * offset.mp[0].stride / 6;
+ y * offset.mp[0].stride / 8;
for (int x = dim.width-1; x >= 0; x--) {
uint16_t raw16_pixel = 0x3FF & (row_start[x/6] >> (10*(x%6)));
raw16_buffer[y*raw16_stride+x] = raw16_pixel;
diff --git a/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_stream.c b/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_stream.c
index 848fd2d..a71f914 100644
--- a/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_stream.c
+++ b/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_stream.c
@@ -2029,11 +2029,11 @@
case CAM_FORMAT_BAYER_IDEAL_RAW_QCOM_10BPP_RGGB:
case CAM_FORMAT_BAYER_IDEAL_RAW_QCOM_10BPP_BGGR:
/* Every 12 pixels occupy 16 bytes */
- stride = (dim->width + 11)/12 * 12;
+ stride = (dim->width + 11)/12 * 16;
buf_planes->plane_info.num_planes = 1;
buf_planes->plane_info.mp[0].offset = 0;
buf_planes->plane_info.mp[0].len =
- PAD_TO_SIZE(stride * scanline * 8 / 6, padding->plane_padding);
+ PAD_TO_SIZE(stride * scanline, padding->plane_padding);
buf_planes->plane_info.frame_len =
PAD_TO_SIZE(buf_planes->plane_info.mp[0].len, CAM_PAD_TO_4K);
buf_planes->plane_info.mp[0].offset_x =0;
@@ -2050,11 +2050,11 @@
case CAM_FORMAT_BAYER_IDEAL_RAW_QCOM_12BPP_RGGB:
case CAM_FORMAT_BAYER_IDEAL_RAW_QCOM_12BPP_BGGR:
/* Every 10 pixels occupy 16 bytes */
- stride = (dim->width + 9)/10 * 10;
+ stride = (dim->width + 9)/10 * 16;
buf_planes->plane_info.num_planes = 1;
buf_planes->plane_info.mp[0].offset = 0;
buf_planes->plane_info.mp[0].len =
- PAD_TO_SIZE(stride * scanline * 8 / 5, padding->plane_padding);
+ PAD_TO_SIZE(stride * scanline, padding->plane_padding);
buf_planes->plane_info.frame_len =
PAD_TO_SIZE(buf_planes->plane_info.mp[0].len, CAM_PAD_TO_4K);
buf_planes->plane_info.mp[0].offset_x =0;
@@ -2071,7 +2071,8 @@
case CAM_FORMAT_BAYER_IDEAL_RAW_MIPI_10BPP_RGGB:
case CAM_FORMAT_BAYER_IDEAL_RAW_MIPI_10BPP_BGGR:
/* Every 64 pixels occupy 80 bytes */
- stride = PAD_TO_SIZE(dim->width * 5 / 4, CAM_PAD_TO_8);
+ stride = PAD_TO_SIZE(
+ PAD_TO_SIZE(dim->width, CAM_PAD_TO_4)*5/4, CAM_PAD_TO_16);
buf_planes->plane_info.num_planes = 1;
buf_planes->plane_info.mp[0].offset = 0;
buf_planes->plane_info.mp[0].len =
@@ -2092,11 +2093,11 @@
case CAM_FORMAT_BAYER_IDEAL_RAW_MIPI_12BPP_RGGB:
case CAM_FORMAT_BAYER_IDEAL_RAW_MIPI_12BPP_BGGR:
/* Every 32 pixels occupy 48 bytes */
- stride = PAD_TO_SIZE(dim->width, CAM_PAD_TO_32);
+ stride = PAD_TO_SIZE(PAD_TO_SIZE(dim->width, 2)*3/2, CAM_PAD_TO_16);
buf_planes->plane_info.num_planes = 1;
buf_planes->plane_info.mp[0].offset = 0;
buf_planes->plane_info.mp[0].len =
- PAD_TO_SIZE(stride * scanline * 3 / 2, padding->plane_padding);
+ PAD_TO_SIZE(stride * scanline, padding->plane_padding);
buf_planes->plane_info.frame_len =
PAD_TO_SIZE(buf_planes->plane_info.mp[0].len, CAM_PAD_TO_4K);
buf_planes->plane_info.mp[0].offset_x =0;
@@ -2117,11 +2118,11 @@
case CAM_FORMAT_BAYER_IDEAL_RAW_PLAIN16_12BPP_RGGB:
case CAM_FORMAT_BAYER_IDEAL_RAW_PLAIN16_12BPP_BGGR:
/* Every 8 pixels occupy 16 bytes */
- stride = PAD_TO_SIZE(dim->width, CAM_PAD_TO_8);
+ stride = PAD_TO_SIZE(dim->width, CAM_PAD_TO_8) * 2;
buf_planes->plane_info.num_planes = 1;
buf_planes->plane_info.mp[0].offset = 0;
buf_planes->plane_info.mp[0].len =
- PAD_TO_SIZE(stride * scanline * 2, padding->plane_padding);
+ PAD_TO_SIZE(stride * scanline, padding->plane_padding);
buf_planes->plane_info.frame_len =
PAD_TO_SIZE(buf_planes->plane_info.mp[0].len, CAM_PAD_TO_4K);
buf_planes->plane_info.mp[0].offset_x =0;
