Add camera_decoder

cmd/camera.h

@@ -29,6 +29,10 @@ typedef struct camera_s {
         struct {
           device_t *isp;
         } legacy_isp;
+
+        struct {
+          device_t *decoder;
+        } decoder;
       };
     };
   };
@@ -50,3 +54,4 @@ int camera_run(camera_t *camera);
 int camera_configure_isp(camera_t *camera, float high_div, float low_div);
 int camera_configure_legacy_isp(camera_t *camera, float div);
 int camera_configure_direct(camera_t *camera);
+int camera_configure_decoder(camera_t *camera);

cmd/camera_decoder.c

@@ -0,0 +1,47 @@
+#include "camera.h"
+
+#include "hw/buffer.h"
+#include "hw/buffer_list.h"
+#include "hw/device.h"
+#include "hw/links.h"
+#include "hw/v4l2.h"
+#include "hw/buffer_list.h"
+#include "http/http.h"
+
+int camera_configure_decoder(camera_t *camera)
+{
+  if (device_open_buffer_list(camera->camera, true, camera->width, camera->height, camera->format, 0, camera->nbufs, true) < 0) {
+    return -1;
+  }
+
+  buffer_list_t *src = camera->camera->capture_list;
+
+  camera->decoder.decoder = device_open("DECODER", "/dev/video10");
+  camera->codec_jpeg = device_open("JPEG", "/dev/video31");
+  camera->codec_h264 = device_open("H264", "/dev/video11");
+
+  if (device_open_buffer_list_output(camera->decoder.decoder, src) < 0 ||
+    device_open_buffer_list_capture(camera->decoder.decoder, src, 1.0, V4L2_PIX_FMT_YUV420, true) < 0) {
+    return -1;
+  }
+
+  src = camera->decoder.decoder->capture_list;
+
+  if (device_open_buffer_list_output(camera->codec_jpeg, src) < 0 ||
+    device_open_buffer_list_capture(camera->codec_jpeg, src, 1.0, V4L2_PIX_FMT_JPEG, true) < 0) {
+    return -1;
+  }
+
+  if (device_open_buffer_list_output(camera->codec_h264, src) < 0 ||
+    device_open_buffer_list_capture(camera->codec_h264, src, 1.0, V4L2_PIX_FMT_H264, true) < 0) {
+    return -1;
+  }
+
+  link_t *links = camera->links;
+
+  *links++ = (link_t){ camera->camera, { camera->decoder.decoder } };
+  *links++ = (link_t){ camera->decoder.decoder, { camera->codec_jpeg, camera->codec_h264 } };
+  *links++ = (link_t){ camera->codec_jpeg, { }, { http_jpeg_capture, http_jpeg_needs_buffer } };
+  *links++ = (link_t){ camera->codec_h264, { }, { http_h264_capture, http_h264_needs_buffer } };
+  return 0;
+}

hw/buffer_list.c

@@ -85,6 +85,10 @@ retry:
     E_LOG_INFO(buf_list, "Adapting size to 32x32 block: %dx%d vs %dx%d", orig_width, orig_height, width, height);
   }
 
+  if (format == V4L2_PIX_FMT_H264) {
+    bytesperline = 0;
+  }
+
   if (buf_list->do_mplanes) {
     fmt->fmt.pix_mp.colorspace = V4L2_COLORSPACE_JPEG;
     fmt->fmt.pix_mp.width = width;

hw/buffer_queue.c

@@ -30,11 +30,7 @@ bool buffer_consumed(buffer_t *buf)
   }
 
   pthread_mutex_lock(&buffer_lock);
-  if (buf->mmap_reflinks > 0) {
+  if (!buf->enqueued && buf->mmap_reflinks == 1) {
-    buf->mmap_reflinks--;
-  }
-
-  if (!buf->enqueued && buf->mmap_reflinks == 0) {
     // update used bytes
     if (buf->buf_list->do_mplanes) {
       buf->v4l2_plane.bytesused = buf->used;
@@ -48,6 +44,7 @@ bool buffer_consumed(buffer_t *buf)
     buf->enqueued_time_us = get_monotonic_time_us(NULL, &buf->v4l2_buffer.timestamp);
     E_XIOCTL(buf, buf->buf_list->device->fd, VIDIOC_QBUF, &buf->v4l2_buffer, "Can't queue buffer.");
     buf->enqueued = true;
+    buf->mmap_reflinks--;
   }
 
   pthread_mutex_unlock(&buffer_lock);
@@ -58,7 +55,6 @@ error:
   {
     buffer_t *mmap_source = buf->mmap_source;
     buf->mmap_source = NULL;
-
     pthread_mutex_unlock(&buffer_lock);
 
     if (mmap_source) {