From 3f9d235505b71867befc13aaf7df0f4127857f70 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 5 Apr 2022 10:20:01 +0200
Subject: [PATCH] Fix JPEG

---
 cmd/camera.c     |  6 ++++--
 hw/buffer_list.c | 35 +++++++++++++++++++++--------------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/cmd/camera.c b/cmd/camera.c
index 0bc5e63..ab27a50 100644
--- a/cmd/camera.c
+++ b/cmd/camera.c
@@ -36,9 +36,11 @@ int camera_open(camera_t *camera, const char *path)
 
 int camera_set_params(camera_t *camera)
 {
-  DEVICE_SET_OPTION(camera->camera, EXPOSURE, 1148);
+  DEVICE_SET_OPTION(camera->camera, EXPOSURE, 2684);
   DEVICE_SET_OPTION(camera->camera, ANALOGUE_GAIN, 938);
-  DEVICE_SET_OPTION(camera->camera, DIGITAL_GAIN, 256);
+  DEVICE_SET_OPTION(camera->camera, DIGITAL_GAIN, 512);
+  DEVICE_SET_OPTION(camera->camera, VBLANK, 1636);
+  DEVICE_SET_OPTION(camera->camera, HBLANK, 6906);
 
   DEVICE_SET_OPTION2(camera->codec_jpeg, JPEG, COMPRESSION_QUALITY, 80);
 
diff --git a/hw/buffer_list.c b/hw/buffer_list.c
index 2c78ffe..d8517ce 100644
--- a/hw/buffer_list.c
+++ b/hw/buffer_list.c
@@ -70,17 +70,16 @@ int buffer_list_set_format(buffer_list_t *buf_list, unsigned width, unsigned hei
 
   fmt->type = buf_list->type;
 
-  bool retried = false;
   unsigned orig_width = width;
   unsigned orig_height = height;
-  unsigned stride = 0;
+  unsigned *pix_bytesperline;
 
 retry:
 
+  // JPEG is in 16x16 blocks (shrink image to fit)
   if (strstr(buf_list->name, "JPEG")) {
-    width = (width) / 16 * 16;
-    height = (height) / 16 * 16;
-    stride = orig_width * 2;
+    width = width / 16 * 16;
+    height = height / 16 * 16;
     printf("JPEG: %dx%d vs %dx%d\n", orig_width, orig_height, width, height);
   }
 
@@ -91,27 +90,34 @@ retry:
     fmt->fmt.pix_mp.pixelformat = format;
     fmt->fmt.pix_mp.field = V4L2_FIELD_ANY;
     fmt->fmt.pix_mp.num_planes = 1;
-    fmt->fmt.pix_mp.plane_fmt[0].bytesperline = stride;// fourcc_to_stride(orig_width, format);
+    pix_bytesperline = &fmt->fmt.pix_mp.plane_fmt[0].bytesperline;
+    *pix_bytesperline = bytesperline;
   } else {
     fmt->fmt.pix.colorspace = V4L2_COLORSPACE_RAW;
     fmt->fmt.pix.width = width;
     fmt->fmt.pix.height = height;
     fmt->fmt.pix.pixelformat = format;
     fmt->fmt.pix.field = V4L2_FIELD_ANY;
-    fmt->fmt.pix.bytesperline = fourcc_to_stride(width, format);
+    pix_bytesperline = &fmt->fmt.pix.bytesperline;
+    *pix_bytesperline = bytesperline; // stride;// fourcc_to_stride(width, format);
   }
 
   E_LOG_DEBUG(buf_list, "Configuring format ...");
   E_XIOCTL(buf_list, buf_list->device->fd, VIDIOC_S_FMT, fmt, "Can't set format");
 
+  if (bytesperline > 0 && *pix_bytesperline != bytesperline) {
+		E_LOG_ERROR(buf_list, "Requested bytesperline=%u. Got %ux%u.",
+      bytesperline, *pix_bytesperline);
+  }
+
   if (fmt->fmt.pix.width != width || fmt->fmt.pix.height != height) {
-		E_LOG_INFO(buf_list, "Requested resolution=%ux%u is unavailable. Got %ux%u.",
-      width, height, fmt->fmt.pix.width, fmt->fmt.pix.height);
-    if (retried) {
-      E_LOG_ERROR(buf_list, "Did retry.");
+    if (bytesperline) {
+      E_LOG_ERROR(buf_list, "Requested resolution=%ux%u is unavailable. Got %ux%u.",
+        width, height, fmt->fmt.pix.width, fmt->fmt.pix.height);
+    } else {
+      E_LOG_INFO(buf_list, "Requested resolution=%ux%u is unavailable. Got %ux%u. Accepted",
+        width, height, fmt->fmt.pix.width, fmt->fmt.pix.height);
     }
-    retried = true;
-    goto retry;
   }
 
 	if (fmt->fmt.pix.pixelformat != format) {
@@ -125,12 +131,13 @@ retry:
     "Using: %ux%u/%s, bytesperline=%d",
     fmt->fmt.pix.width, fmt->fmt.pix.height,
     fourcc_to_string(fmt->fmt.pix.pixelformat).buf,
-    fmt->fmt.pix.bytesperline
+    *pix_bytesperline
   );
 
   buf_list->fmt_width = fmt->fmt.pix.width;
   buf_list->fmt_height = fmt->fmt.pix.height;
   buf_list->fmt_format = fmt->fmt.pix.pixelformat;
+  buf_list->fmt_bytesperline = *pix_bytesperline;
 
   return 0;