[v4l-utils PATCH v5 0/3] stateless decoder implementation

[v4l-utils PATCH v5 0/3] stateless decoder implementation

[Dafna Hirschfeld]

changes from v4: remove comp_frame_size from fwht params

Dafna Hirschfeld (3):
  v4l-utils: copy fwht-ctrls.h from kernel dir
  v4l2-ctl: Add functions and variables to support fwht stateless
    decoder
  v4l2-ctl: Add implementation for the stateless fwht decoder.

 Makefile.am                           |   1 +
 utils/common/codec-fwht.patch         |   7 +-
 utils/v4l2-ctl/v4l2-ctl-streaming.cpp | 363 +++++++++++++++++++++++++-
 3 files changed, 365 insertions(+), 6 deletions(-)

-- 
2.17.1

[v4l-utils PATCH v5 1/3] v4l-utils: copy fwht-ctrls.h from kernel dir

[Dafna Hirschfeld]

copy fwht-ctrls.h from the kernel dir when
running 'sync' and add typedef for u64
in codec-fwht.h

Signed-off-by: Dafna Hirschfeld <dafna3@gmail.com>
---
 Makefile.am                   | 1 +
 utils/common/codec-fwht.patch | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b0b8a098..8abe4f94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,6 +52,7 @@ sync-with-kernel:
 	cp -a $(KERNEL_DIR)/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c $(top_srcdir)/utils/common
 	cp -a $(KERNEL_DIR)/drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c $(top_srcdir)/utils/common
 	cp -a $(KERNEL_DIR)/include/media/tpg/v4l2-tpg* $(top_srcdir)/utils/common
+	cp -a $(KERNEL_DIR)/include/media/fwht-ctrls.h $(top_srcdir)/utils/common
 	patch -d $(top_srcdir) --no-backup-if-mismatch -p0 <$(top_srcdir)/utils/common/v4l2-tpg.patch
 	cp -a $(KERNEL_DIR)/drivers/media/platform/vicodec/codec-fwht.[ch] $(top_srcdir)/utils/common/
 	cp -a $(KERNEL_DIR)/drivers/media/platform/vicodec/codec-v4l2-fwht.[ch] $(top_srcdir)/utils/common/
diff --git a/utils/common/codec-fwht.patch b/utils/common/codec-fwht.patch
index 37ac4672..ad27b37a 100644
--- a/utils/common/codec-fwht.patch
+++ b/utils/common/codec-fwht.patch
@@ -1,6 +1,6 @@
---- a/utils/common/codec-fwht.h.old	2018-12-29 11:23:58.128328613 -0800
-+++ b/utils/common/codec-fwht.h	2018-12-29 11:24:16.099127560 -0800
-@@ -8,8 +8,26 @@
+--- a/utils/common/codec-fwht.h.old	2019-02-23 09:38:59.454065366 -0800
++++ b/utils/common/codec-fwht.h	2019-02-23 09:40:44.007803414 -0800
+@@ -8,8 +8,27 @@
  #define CODEC_FWHT_H
  
  #include <linux/types.h>
@@ -21,6 +21,7 @@
 +#define round_up(x, y) ((((x)-1) | __round_mask(x, y))+1)
 +
 +
++typedef __u64 u64;
 +typedef __u32 u32;
 +typedef __u16 u16;
 +typedef __s16 s16;
-- 
2.17.1

[v4l-utils PATCH v5 2/3] v4l2-ctl: Add functions and variables to support fwht stateless decoder

[Dafna Hirschfeld]

Add the variable 'last_fwht_bf_ts' and the array 'fwht_reqs' to
allow the fwht stateless decoder to maintain the requests.

Signed-off-by: Dafna Hirschfeld <dafna3@gmail.com>
---
 utils/v4l2-ctl/v4l2-ctl-streaming.cpp | 129 ++++++++++++++++++++++++++
 1 file changed, 129 insertions(+)

diff --git a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
index adfa6796..dd0eeef6 100644
--- a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
+++ b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
@@ -17,9 +17,12 @@
 #include <sys/mman.h>
 #include <dirent.h>
 #include <math.h>
+#include <linux/media.h>
 
 #include "v4l2-ctl.h"
 #include "v4l-stream.h"
+#include <media-info.h>
+#include <fwht-ctrls.h>
 
 extern "C" {
 #include "v4l2-tpg.h"
@@ -80,6 +83,16 @@ static bool support_cap_compose;
 static bool support_out_crop;
 static bool in_source_change_event;
 
+static __u64 last_fwht_bf_ts;
+
+struct request_fwht {
+	int fd;
+	__u64 ts;
+	struct v4l2_ctrl_fwht_params params;
+};
+
+static request_fwht fwht_reqs[VIDEO_MAX_FRAME];
+
 #define TS_WINDOW 241
 #define FILE_HDR_ID			v4l2_fourcc('V', 'h', 'd', 'r')
 
@@ -420,6 +433,12 @@ static int get_out_crop_rect(cv4l_fd &fd)
 	return 0;
 }
 
+static __u64 get_ns_timestamp(cv4l_buffer &buf)
+{
+	const struct timeval tv = buf.g_timestamp();
+	return v4l2_timeval_to_ns(&tv);
+}
+
 static void set_time_stamp(cv4l_buffer &buf)
 {
 	if ((buf.g_flags() & V4L2_BUF_FLAG_TIMESTAMP_MASK) != V4L2_BUF_FLAG_TIMESTAMP_COPY)
@@ -749,6 +768,116 @@ void streaming_cmd(int ch, char *optarg)
 	}
 }
 
+/*
+ * Assume that the fwht stream is valid and that each
+ * frame starts right after the previous one.
+ */
+static void read_fwht_frame(cv4l_fmt &fmt, unsigned char *buf,
+			    FILE *fpointer, unsigned &sz,
+			    unsigned &len)
+{
+	struct fwht_cframe_hdr *h = (struct fwht_cframe_hdr *)buf;
+
+	len = sizeof(struct fwht_cframe_hdr);
+	sz = fread(buf, 1, sizeof(struct fwht_cframe_hdr), fpointer);
+	if (sz < sizeof(struct fwht_cframe_hdr))
+		return;
+
+	len += ntohl(h->size);
+	sz += fread(buf + sz, 1, ntohl(h->size), fpointer);
+}
+
+static void set_fwht_stateless_params(struct v4l2_ctrl_fwht_params &fwht_params,
+				      const struct fwht_cframe_hdr *hdr,
+				      __u64 last_bf_ts)
+{
+	fwht_params.backward_ref_ts = last_bf_ts;
+	fwht_params.version = ntohl(hdr->version);
+	fwht_params.width = ntohl(hdr->width);
+	fwht_params.height = ntohl(hdr->height);
+	fwht_params.flags = ntohl(hdr->flags);
+	fwht_params.colorspace = ntohl(hdr->colorspace);
+	fwht_params.xfer_func = ntohl(hdr->xfer_func);
+	fwht_params.ycbcr_enc = ntohl(hdr->ycbcr_enc);
+	fwht_params.quantization = ntohl(hdr->quantization);
+
+	if (!last_bf_ts)
+		fwht_params.flags |= FWHT_FL_I_FRAME;
+}
+
+static int alloc_fwht_req(int media_fd, unsigned index)
+{
+	int rc = 0;
+
+	rc = ioctl(media_fd, MEDIA_IOC_REQUEST_ALLOC, &fwht_reqs[index]);
+	if (rc < 0) {
+		fprintf(stderr, "Unable to allocate media request: %s\n",
+			strerror(errno));
+		return rc;
+	}
+
+	return 0;
+}
+
+static void set_fwht_req_by_idx(unsigned idx, struct fwht_cframe_hdr *hdr,
+				__u64 last_bf_ts, __u64 ts)
+{
+	struct v4l2_ctrl_fwht_params fwht_params;
+
+	set_fwht_stateless_params(fwht_params, hdr, last_bf_ts);
+
+	fwht_reqs[idx].ts = ts;
+	fwht_reqs[idx].params = fwht_params;
+}
+
+static int get_fwht_req_by_ts(__u64 ts)
+{
+	for (int idx = 0; idx < VIDEO_MAX_FRAME; idx++) {
+		if (fwht_reqs[idx].ts == ts)
+			return idx;
+	}
+	return -1;
+}
+
+static bool set_fwht_req_by_fd(struct fwht_cframe_hdr *hdr,
+			       int req_fd, __u64 last_bf_ts, __u64 ts)
+{
+	struct v4l2_ctrl_fwht_params fwht_params;
+
+	set_fwht_stateless_params(fwht_params, hdr, last_bf_ts);
+
+	for (int idx = 0; idx < VIDEO_MAX_FRAME; idx++) {
+		if (fwht_reqs[idx].fd == req_fd) {
+			fwht_reqs[idx].ts = ts;
+			fwht_reqs[idx].params = fwht_params;
+			return true;
+		}
+	}
+	return false;
+}
+
+static int set_fwht_ext_ctrl(cv4l_fd &fd, struct fwht_cframe_hdr *hdr,
+			     __u64 last_bf_ts, int req_fd)
+{
+	v4l2_ext_controls controls;
+	struct v4l2_ext_control control;
+	struct v4l2_ctrl_fwht_params fwht_params;
+
+	memset(&control, 0, sizeof(control));
+	memset(&controls, 0, sizeof(controls));
+
+	set_fwht_stateless_params(fwht_params, hdr, last_bf_ts);
+
+	control.id = V4L2_CID_MPEG_VIDEO_FWHT_PARAMS;
+	control.ptr = &fwht_params;
+	control.size = sizeof(fwht_params);
+	controls.which = V4L2_CTRL_WHICH_REQUEST_VAL;
+	controls.request_fd = req_fd;
+	controls.controls = &control;
+	controls.count = 1;
+	return fd.s_ext_ctrls(controls);
+}
+
 static void read_write_padded_frame(cv4l_fmt &fmt, unsigned char *buf,
 				    FILE *fpointer, unsigned &sz,
 				    unsigned &len, bool is_read)
-- 
2.17.1

[v4l-utils PATCH v5 3/3] v4l2-ctl: Add implementation for the stateless fwht decoder.

[Dafna Hirschfeld]

Add code to support the stateless decoder
and the function 'stateless_m2m' that implements it.

Signed-off-by: Dafna Hirschfeld <dafna3@gmail.com>
---
 utils/v4l2-ctl/v4l2-ctl-streaming.cpp | 234 +++++++++++++++++++++++++-
 1 file changed, 231 insertions(+), 3 deletions(-)

diff --git a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
index dd0eeef6..e279b0b5 100644
--- a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
+++ b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
@@ -1071,8 +1071,9 @@ restart:
 				return false;
 			}
 		}
-
-		if (support_out_crop && v4l2_fwht_find_pixfmt(fmt.g_pixelformat()))
+		if (q.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_REQUESTS)
+			read_fwht_frame(fmt, (unsigned char *)buf, fin, sz, len);
+		else if (support_out_crop && v4l2_fwht_find_pixfmt(fmt.g_pixelformat()))
 			read_write_padded_frame(fmt, (unsigned char *)buf, fin, sz, len, true);
 		else
 			sz = fread(buf, 1, len, fin);
@@ -1099,6 +1100,21 @@ restart:
 	return true;
 }
 
+static bool split_fwht_frame(u8 *frame, struct fwht_cframe_hdr *hdr, unsigned max_len)
+{
+	unsigned int len;
+	bool ret = true;
+
+	memcpy(hdr, frame, sizeof(struct fwht_cframe_hdr));
+	len = ntohl(hdr->size);
+	if (len > max_len) {
+		len = max_len;
+		ret = false;
+	}
+	memmove(frame, frame + sizeof(struct fwht_cframe_hdr), len);
+	return ret;
+}
+
 static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf)
 {
 	tpg_pixel_aspect aspect = TPG_PIXEL_ASPECT_SQUARE;
@@ -1203,6 +1219,33 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf
 		if (fin && !fill_buffer_from_file(fd, q, buf, fmt, fin))
 			return -2;
 
+		struct fwht_cframe_hdr hdr;
+
+		if (q.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_REQUESTS) {
+			int media_fd = mi_get_media_fd(fd.g_fd());
+
+			if (!split_fwht_frame((u8 *)q.g_dataptr(buf.g_index(), 0),
+					      &hdr, buf.g_length(0)))
+				fprintf(stderr, "%s: warning: size field in fwht header is larger than buf size\n",
+					__func__);
+
+			if (media_fd < 0) {
+				fprintf(stderr, "%s: mi_get_media_fd failed\n", __func__);
+				return media_fd;
+			}
+
+			if (alloc_fwht_req(media_fd, i))
+				return -1;
+			buf.s_request_fd(fwht_reqs[i].fd);
+			buf.or_flags(V4L2_BUF_FLAG_REQUEST_FD);
+
+			if (set_fwht_ext_ctrl(fd, &hdr, last_fwht_bf_ts,
+					      buf.g_request_fd())) {
+				fprintf(stderr, "%s: set_fwht_ext_ctrls failed on %dth buf: %s\n",
+					__func__, i, strerror(errno));
+				return -1;
+			}
+		}
 		if (qbuf) {
 			set_time_stamp(buf);
 			if (fd.qbuf(buf))
@@ -1212,6 +1255,16 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf
 				fprintf(stderr, ">");
 			fflush(stderr);
 		}
+		if (q.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_REQUESTS) {
+			set_fwht_req_by_idx(i, &hdr,
+					    last_fwht_bf_ts, get_ns_timestamp(buf));
+			last_fwht_bf_ts = get_ns_timestamp(buf);
+			if (ioctl(buf.g_request_fd(), MEDIA_REQUEST_IOC_QUEUE) < 0) {
+				fprintf(stderr, "Unable to queue media request: %s\n",
+					strerror(errno));
+				return -1;
+			}
+		}
 	}
 	if (qbuf)
 		output_field = field;
@@ -1450,12 +1503,48 @@ static int do_handle_out(cv4l_fd &fd, cv4l_queue &q, FILE *fin, cv4l_buffer *cap
 				       (u8 *)q.g_dataptr(buf.g_index(), j));
 	}
 
+	struct fwht_cframe_hdr hdr;
+
+	if (q.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_REQUESTS) {
+		if (ioctl(buf.g_request_fd(), MEDIA_REQUEST_IOC_REINIT, NULL)) {
+			fprintf(stderr, "Unable to reinit media request: %s\n",
+				strerror(errno));
+			return -1;
+		}
+		if (!split_fwht_frame((u8 *)q.g_dataptr(buf.g_index(), 0), &hdr, buf.g_length(0)))
+			fprintf(stderr, "%s: warning: size field in fwht header is larger than buf size\n",
+					__func__);
+
+		if (set_fwht_ext_ctrl(fd, &hdr, last_fwht_bf_ts,
+				      buf.g_request_fd())) {
+			fprintf(stderr, "%s: set_fwht_ext_ctrls failed: %s\n",
+				__func__, strerror(errno));
+			return -1;
+		}
+	}
+
 	set_time_stamp(buf);
 
 	if (fd.qbuf(buf)) {
 		fprintf(stderr, "%s: failed: %s\n", "VIDIOC_QBUF", strerror(errno));
 		return -1;
 	}
+	if (q.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_REQUESTS) {
+		if (!set_fwht_req_by_fd(&hdr, buf.g_request_fd(), last_fwht_bf_ts,
+					get_ns_timestamp(buf))) {
+			fprintf(stderr, "%s: request for fd %d does not exist\n",
+				__func__, buf.g_request_fd());
+			return -1;
+		}
+
+		last_fwht_bf_ts = get_ns_timestamp(buf);
+		if (ioctl(buf.g_request_fd(), MEDIA_REQUEST_IOC_QUEUE) < 0) {
+			fprintf(stderr, "Unable to queue media request: %s\n",
+				strerror(errno));
+			return -1;
+		}
+	}
+
 	tpg_update_mv_count(&tpg, V4L2_FIELD_HAS_T_OR_B(output_field));
 
 	if (!verbose)
@@ -2244,6 +2333,140 @@ static void stateful_m2m(cv4l_fd &fd, cv4l_queue &in, cv4l_queue &out,
 	tpg_free(&tpg);
 }
 
+static void stateless_m2m(cv4l_fd &fd, cv4l_queue &in, cv4l_queue &out,
+			  FILE *fin, FILE *fout, cv4l_fd *exp_fd_p)
+{
+	fps_timestamps fps_ts[2];
+	unsigned count[2] = { 0, 0 };
+	cv4l_fmt fmt[2];
+	int fd_flags = fcntl(fd.g_fd(), F_GETFL);
+
+	fd.g_fmt(fmt[OUT], out.g_type());
+	fd.g_fmt(fmt[CAP], in.g_type());
+
+	if (out.reqbufs(&fd, reqbufs_count_out)) {
+		fprintf(stderr, "%s: out.reqbufs failed\n", __func__);
+		return;
+	}
+
+	if (in.reqbufs(&fd, reqbufs_count_cap)) {
+		fprintf(stderr, "%s: in.reqbufs failed\n", __func__);
+		return;
+	}
+
+	if (exp_fd_p && in.export_bufs(exp_fd_p, exp_fd_p->g_type()))
+		return;
+
+	if (in.obtain_bufs(&fd)) {
+		fprintf(stderr, "%s: in.obtain_bufs error\n", __func__);
+		return;
+	}
+
+	if (do_setup_out_buffers(fd, out, fout, true) == -1) {
+		fprintf(stderr, "%s: do_setup_out_buffers failed\n", __func__);
+		return;
+	}
+
+	if (in.queue_all(&fd)) {
+		fprintf(stderr, "%s: in.queue_all failed\n", __func__);
+		return;
+	}
+
+	if (fd.streamon(out.g_type())) {
+		fprintf(stderr, "%s: streamon for out failed\n", __func__);
+		return;
+	}
+
+	if (fd.streamon(in.g_type())) {
+		fprintf(stderr, "%s: streamon for in failed\n", __func__);
+		return;
+	}
+	int index = 0;
+	bool queue_lst_buf = false;
+	cv4l_buffer last_in_buf;
+
+	fcntl(fd.g_fd(), F_SETFL, fd_flags | O_NONBLOCK);
+
+	while (true) {
+		fd_set except_fds;
+		int req_fd =fwht_reqs[index].fd;
+		struct timeval tv = { 2, 0 };
+
+		FD_ZERO(&except_fds);
+		FD_SET(req_fd, &except_fds);
+
+		int rc = select(req_fd + 1, NULL, NULL, &except_fds, &tv);
+
+		if (rc == 0) {
+			fprintf(stderr, "Timeout when waiting for media request\n");
+			return;
+		} else if (rc < 0) {
+			fprintf(stderr, "Unable to select media request: %s\n",
+				strerror(errno));
+			return;
+		}
+		/*
+		 * it is safe to queue back last cap buffer only after
+		 * the following request is done so that the buffer
+		 * is not needed anymore as a reference frame
+		 */
+		if (queue_lst_buf) {
+			if (fd.qbuf(last_in_buf) < 0) {
+				fprintf(stderr, "%s: qbuf failed\n", __func__);
+				return;
+			}
+		}
+		int buf_idx = -1;
+		  /*
+		   * fin is not sent to do_handle_cap since the capture buf is
+		   * written to the file in current function
+		   */
+		rc = do_handle_cap(fd, in, NULL, &buf_idx, count[CAP],
+				   fps_ts[CAP], fmt[CAP]);
+		if (rc) {
+			fprintf(stderr, "%s: do_handle_cap err\n", __func__);
+			return;
+		}
+		/*
+		 * in case of an error in the frame, set last ts to 0 as a mean
+		 * to recover so that next request will not use a
+		 * reference buffer. Otherwise the error flag will be set to
+		 * all the future capture buffers.
+		 */
+		if (buf_idx == -1) {
+			fprintf(stderr, "%s: frame returned with error\n", __func__);
+			last_fwht_bf_ts	= 0;
+		} else {
+			cv4l_buffer cap_buf(in, index);
+			if (fd.querybuf(cap_buf))
+				return;
+			last_in_buf = cap_buf;
+			queue_lst_buf = true;
+			if (fin && cap_buf.g_bytesused(0) &&
+			    !(cap_buf.g_flags() & V4L2_BUF_FLAG_ERROR)) {
+				int idx = get_fwht_req_by_ts(get_ns_timestamp(cap_buf));
+
+				if (idx < 0) {
+					fprintf(stderr, "%s: could not find request from buffer\n", __func__);
+					fprintf(stderr, "%s: ts = %llu\n", __func__, get_ns_timestamp(cap_buf));
+					return;
+				}
+				composed_width = fwht_reqs[idx].params.width;
+				composed_height = fwht_reqs[idx].params.height;
+				write_buffer_to_file(fd, in, cap_buf,
+						     fmt[CAP], fin);
+			}
+		}
+		rc = do_handle_out(fd, out, fout, NULL, count[OUT],
+				   fps_ts[OUT], fmt[OUT]);
+		if (rc) {
+			fprintf(stderr, "%s: output stream ended\n", __func__);
+			close(req_fd);
+		}
+		index = (index + 1) % out.g_buffers();
+	}
+}
+
 static void streaming_set_m2m(cv4l_fd &fd, cv4l_fd &exp_fd)
 {
 	cv4l_queue in(fd.g_type(), memory);
@@ -2280,7 +2503,12 @@ static void streaming_set_m2m(cv4l_fd &fd, cv4l_fd &exp_fd)
 		if (out.export_bufs(&exp_fd, exp_fd.g_type()))
 			return;
 	}
-	stateful_m2m(fd, in, out, file[CAP], file[OUT], exp_fd_p);
+	if (out.reqbufs(&fd, 0))
+		goto done;
+	if (out.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_REQUESTS)
+		stateless_m2m(fd, in, out, file[CAP], file[OUT], exp_fd_p);
+	else
+		stateful_m2m(fd, in, out, file[CAP], file[OUT], exp_fd_p);
 done:
 	if (options[OptStreamDmaBuf] || options[OptStreamOutDmaBuf])
 		exp_q.close_exported_fds();
-- 
2.17.1

Re: [v4l-utils PATCH v5 2/3] v4l2-ctl: Add functions and variables to support fwht stateless decoder

[Hans Verkuil]

On 2/27/19 8:07 AM, Dafna Hirschfeld wrote:
> Add the variable 'last_fwht_bf_ts' and the array 'fwht_reqs' to
> allow the fwht stateless decoder to maintain the requests.
> 
> Signed-off-by: Dafna Hirschfeld <dafna3@gmail.com>
> ---
>  utils/v4l2-ctl/v4l2-ctl-streaming.cpp | 129 ++++++++++++++++++++++++++
>  1 file changed, 129 insertions(+)
> 
> diff --git a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
> index adfa6796..dd0eeef6 100644
> --- a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
> +++ b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
> @@ -17,9 +17,12 @@
>  #include <sys/mman.h>
>  #include <dirent.h>
>  #include <math.h>
> +#include <linux/media.h>
>  
>  #include "v4l2-ctl.h"
>  #include "v4l-stream.h"
> +#include <media-info.h>
> +#include <fwht-ctrls.h>
>  
>  extern "C" {
>  #include "v4l2-tpg.h"
> @@ -80,6 +83,16 @@ static bool support_cap_compose;
>  static bool support_out_crop;
>  static bool in_source_change_event;
>  
> +static __u64 last_fwht_bf_ts;
> +
> +struct request_fwht {
> +	int fd;
> +	__u64 ts;
> +	struct v4l2_ctrl_fwht_params params;
> +};
> +
> +static request_fwht fwht_reqs[VIDEO_MAX_FRAME];
> +
>  #define TS_WINDOW 241
>  #define FILE_HDR_ID			v4l2_fourcc('V', 'h', 'd', 'r')
>  
> @@ -420,6 +433,12 @@ static int get_out_crop_rect(cv4l_fd &fd)
>  	return 0;
>  }
>  
> +static __u64 get_ns_timestamp(cv4l_buffer &buf)
> +{
> +	const struct timeval tv = buf.g_timestamp();
> +	return v4l2_timeval_to_ns(&tv);
> +}
> +
>  static void set_time_stamp(cv4l_buffer &buf)
>  {
>  	if ((buf.g_flags() & V4L2_BUF_FLAG_TIMESTAMP_MASK) != V4L2_BUF_FLAG_TIMESTAMP_COPY)
> @@ -749,6 +768,116 @@ void streaming_cmd(int ch, char *optarg)
>  	}
>  }
>  
> +/*
> + * Assume that the fwht stream is valid and that each
> + * frame starts right after the previous one.
> + */
> +static void read_fwht_frame(cv4l_fmt &fmt, unsigned char *buf,
> +			    FILE *fpointer, unsigned &sz,
> +			    unsigned &len)
> +{
> +	struct fwht_cframe_hdr *h = (struct fwht_cframe_hdr *)buf;
> +
> +	len = sizeof(struct fwht_cframe_hdr);
> +	sz = fread(buf, 1, sizeof(struct fwht_cframe_hdr), fpointer);
> +	if (sz < sizeof(struct fwht_cframe_hdr))
> +		return;
> +
> +	len += ntohl(h->size);
> +	sz += fread(buf + sz, 1, ntohl(h->size), fpointer);
> +}
> +
> +static void set_fwht_stateless_params(struct v4l2_ctrl_fwht_params &fwht_params,
> +				      const struct fwht_cframe_hdr *hdr,
> +				      __u64 last_bf_ts)
> +{
> +	fwht_params.backward_ref_ts = last_bf_ts;
> +	fwht_params.version = ntohl(hdr->version);
> +	fwht_params.width = ntohl(hdr->width);
> +	fwht_params.height = ntohl(hdr->height);
> +	fwht_params.flags = ntohl(hdr->flags);
> +	fwht_params.colorspace = ntohl(hdr->colorspace);
> +	fwht_params.xfer_func = ntohl(hdr->xfer_func);
> +	fwht_params.ycbcr_enc = ntohl(hdr->ycbcr_enc);
> +	fwht_params.quantization = ntohl(hdr->quantization);
> +
> +	if (!last_bf_ts)
> +		fwht_params.flags |= FWHT_FL_I_FRAME;

This is to force an I frame if there are no previous reference frames,
right? The video won't look good until the next real I frame, but at
least it will display something.

This could use a comment since it is not obvious what happens.

For a utility like v4l2-ctl it is probably not a bad idea to do it like
this since this will ensure that you at least get some video output.

Regards,

	Hans

> +}
> +
> +static int alloc_fwht_req(int media_fd, unsigned index)
> +{
> +	int rc = 0;
> +
> +	rc = ioctl(media_fd, MEDIA_IOC_REQUEST_ALLOC, &fwht_reqs[index]);
> +	if (rc < 0) {
> +		fprintf(stderr, "Unable to allocate media request: %s\n",
> +			strerror(errno));
> +		return rc;
> +	}
> +
> +	return 0;
> +}
> +
> +static void set_fwht_req_by_idx(unsigned idx, struct fwht_cframe_hdr *hdr,
> +				__u64 last_bf_ts, __u64 ts)
> +{
> +	struct v4l2_ctrl_fwht_params fwht_params;
> +
> +	set_fwht_stateless_params(fwht_params, hdr, last_bf_ts);
> +
> +	fwht_reqs[idx].ts = ts;
> +	fwht_reqs[idx].params = fwht_params;
> +}
> +
> +static int get_fwht_req_by_ts(__u64 ts)
> +{
> +	for (int idx = 0; idx < VIDEO_MAX_FRAME; idx++) {
> +		if (fwht_reqs[idx].ts == ts)
> +			return idx;
> +	}
> +	return -1;
> +}
> +
> +static bool set_fwht_req_by_fd(struct fwht_cframe_hdr *hdr,
> +			       int req_fd, __u64 last_bf_ts, __u64 ts)
> +{
> +	struct v4l2_ctrl_fwht_params fwht_params;
> +
> +	set_fwht_stateless_params(fwht_params, hdr, last_bf_ts);
> +
> +	for (int idx = 0; idx < VIDEO_MAX_FRAME; idx++) {
> +		if (fwht_reqs[idx].fd == req_fd) {
> +			fwht_reqs[idx].ts = ts;
> +			fwht_reqs[idx].params = fwht_params;
> +			return true;
> +		}
> +	}
> +	return false;
> +}
> +
> +static int set_fwht_ext_ctrl(cv4l_fd &fd, struct fwht_cframe_hdr *hdr,
> +			     __u64 last_bf_ts, int req_fd)
> +{
> +	v4l2_ext_controls controls;
> +	struct v4l2_ext_control control;
> +	struct v4l2_ctrl_fwht_params fwht_params;
> +
> +	memset(&control, 0, sizeof(control));
> +	memset(&controls, 0, sizeof(controls));
> +
> +	set_fwht_stateless_params(fwht_params, hdr, last_bf_ts);
> +
> +	control.id = V4L2_CID_MPEG_VIDEO_FWHT_PARAMS;
> +	control.ptr = &fwht_params;
> +	control.size = sizeof(fwht_params);
> +	controls.which = V4L2_CTRL_WHICH_REQUEST_VAL;
> +	controls.request_fd = req_fd;
> +	controls.controls = &control;
> +	controls.count = 1;
> +	return fd.s_ext_ctrls(controls);
> +}
> +
>  static void read_write_padded_frame(cv4l_fmt &fmt, unsigned char *buf,
>  				    FILE *fpointer, unsigned &sz,
>  				    unsigned &len, bool is_read)
> 

Re: [v4l-utils PATCH v5 3/3] v4l2-ctl: Add implementation for the stateless fwht decoder.

[Hans Verkuil]

On 2/27/19 8:07 AM, Dafna Hirschfeld wrote:
> Add code to support the stateless decoder
> and the function 'stateless_m2m' that implements it.
> 
> Signed-off-by: Dafna Hirschfeld <dafna3@gmail.com>
> ---
>  utils/v4l2-ctl/v4l2-ctl-streaming.cpp | 234 +++++++++++++++++++++++++-
>  1 file changed, 231 insertions(+), 3 deletions(-)
> 
> diff --git a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
> index dd0eeef6..e279b0b5 100644
> --- a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
> +++ b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
> @@ -1071,8 +1071,9 @@ restart:
>  				return false;
>  			}
>  		}
> -
> -		if (support_out_crop && v4l2_fwht_find_pixfmt(fmt.g_pixelformat()))
> +		if (q.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_REQUESTS)
> +			read_fwht_frame(fmt, (unsigned char *)buf, fin, sz, len);

This looks wrong. This should (I think) test if fmt.g_pixelformat() == V4L2_PIX_FMT_FWHT_STATELESS
and only then call read_fwht_frame().

Right now it would also call this function for e.g. the cedrus driver, which is obviously
wrong.

What is also inefficient is that read_fwht_frame first reads the header in the buffer,
then reads the compressed data after the header. This means that you need to do a
memmove as you do below.

Why not read the header into a global struct fwht_cframe_hdr? Then you don't need a
split_fwht_frame, which is very inefficient.

> +		else if (support_out_crop && v4l2_fwht_find_pixfmt(fmt.g_pixelformat()))
>  			read_write_padded_frame(fmt, (unsigned char *)buf, fin, sz, len, true);
>  		else
>  			sz = fread(buf, 1, len, fin);
> @@ -1099,6 +1100,21 @@ restart:
>  	return true;
>  }
>  
> +static bool split_fwht_frame(u8 *frame, struct fwht_cframe_hdr *hdr, unsigned max_len)
> +{
> +	unsigned int len;
> +	bool ret = true;
> +
> +	memcpy(hdr, frame, sizeof(struct fwht_cframe_hdr));
> +	len = ntohl(hdr->size);
> +	if (len > max_len) {
> +		len = max_len;
> +		ret = false;
> +	}
> +	memmove(frame, frame + sizeof(struct fwht_cframe_hdr), len);
> +	return ret;
> +}
> +
>  static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf)
>  {
>  	tpg_pixel_aspect aspect = TPG_PIXEL_ASPECT_SQUARE;
> @@ -1203,6 +1219,33 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf
>  		if (fin && !fill_buffer_from_file(fd, q, buf, fmt, fin))
>  			return -2;
>  
> +		struct fwht_cframe_hdr hdr;
> +
> +		if (q.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_REQUESTS) {

Same thing here, check against V4L2_PIX_FMT_FWHT_STATELESS instead. I won't repeat myself,
so check and replace other occurrences of this.

> +			int media_fd = mi_get_media_fd(fd.g_fd());
> +
> +			if (!split_fwht_frame((u8 *)q.g_dataptr(buf.g_index(), 0),
> +					      &hdr, buf.g_length(0)))
> +				fprintf(stderr, "%s: warning: size field in fwht header is larger than buf size\n",
> +					__func__);
> +
> +			if (media_fd < 0) {
> +				fprintf(stderr, "%s: mi_get_media_fd failed\n", __func__);
> +				return media_fd;
> +			}
> +
> +			if (alloc_fwht_req(media_fd, i))
> +				return -1;
> +			buf.s_request_fd(fwht_reqs[i].fd);
> +			buf.or_flags(V4L2_BUF_FLAG_REQUEST_FD);
> +
> +			if (set_fwht_ext_ctrl(fd, &hdr, last_fwht_bf_ts,
> +					      buf.g_request_fd())) {
> +				fprintf(stderr, "%s: set_fwht_ext_ctrls failed on %dth buf: %s\n",
> +					__func__, i, strerror(errno));
> +				return -1;
> +			}
> +		}
>  		if (qbuf) {
>  			set_time_stamp(buf);
>  			if (fd.qbuf(buf))
> @@ -1212,6 +1255,16 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf
>  				fprintf(stderr, ">");
>  			fflush(stderr);
>  		}
> +		if (q.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_REQUESTS) {
> +			set_fwht_req_by_idx(i, &hdr,
> +					    last_fwht_bf_ts, get_ns_timestamp(buf));
> +			last_fwht_bf_ts = get_ns_timestamp(buf);
> +			if (ioctl(buf.g_request_fd(), MEDIA_REQUEST_IOC_QUEUE) < 0) {
> +				fprintf(stderr, "Unable to queue media request: %s\n",
> +					strerror(errno));
> +				return -1;
> +			}
> +		}
>  	}
>  	if (qbuf)
>  		output_field = field;
> @@ -1450,12 +1503,48 @@ static int do_handle_out(cv4l_fd &fd, cv4l_queue &q, FILE *fin, cv4l_buffer *cap
>  				       (u8 *)q.g_dataptr(buf.g_index(), j));
>  	}
>  
> +	struct fwht_cframe_hdr hdr;
> +
> +	if (q.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_REQUESTS) {
> +		if (ioctl(buf.g_request_fd(), MEDIA_REQUEST_IOC_REINIT, NULL)) {
> +			fprintf(stderr, "Unable to reinit media request: %s\n",
> +				strerror(errno));
> +			return -1;
> +		}
> +		if (!split_fwht_frame((u8 *)q.g_dataptr(buf.g_index(), 0), &hdr, buf.g_length(0)))
> +			fprintf(stderr, "%s: warning: size field in fwht header is larger than buf size\n",
> +					__func__);
> +
> +		if (set_fwht_ext_ctrl(fd, &hdr, last_fwht_bf_ts,
> +				      buf.g_request_fd())) {
> +			fprintf(stderr, "%s: set_fwht_ext_ctrls failed: %s\n",
> +				__func__, strerror(errno));
> +			return -1;
> +		}
> +	}
> +
>  	set_time_stamp(buf);
>  
>  	if (fd.qbuf(buf)) {
>  		fprintf(stderr, "%s: failed: %s\n", "VIDIOC_QBUF", strerror(errno));
>  		return -1;
>  	}
> +	if (q.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_REQUESTS) {
> +		if (!set_fwht_req_by_fd(&hdr, buf.g_request_fd(), last_fwht_bf_ts,
> +					get_ns_timestamp(buf))) {
> +			fprintf(stderr, "%s: request for fd %d does not exist\n",
> +				__func__, buf.g_request_fd());
> +			return -1;
> +		}
> +
> +		last_fwht_bf_ts = get_ns_timestamp(buf);
> +		if (ioctl(buf.g_request_fd(), MEDIA_REQUEST_IOC_QUEUE) < 0) {
> +			fprintf(stderr, "Unable to queue media request: %s\n",
> +				strerror(errno));
> +			return -1;
> +		}
> +	}
> +
>  	tpg_update_mv_count(&tpg, V4L2_FIELD_HAS_T_OR_B(output_field));
>  
>  	if (!verbose)
> @@ -2244,6 +2333,140 @@ static void stateful_m2m(cv4l_fd &fd, cv4l_queue &in, cv4l_queue &out,
>  	tpg_free(&tpg);
>  }
>  
> +static void stateless_m2m(cv4l_fd &fd, cv4l_queue &in, cv4l_queue &out,
> +			  FILE *fin, FILE *fout, cv4l_fd *exp_fd_p)
> +{
> +	fps_timestamps fps_ts[2];
> +	unsigned count[2] = { 0, 0 };
> +	cv4l_fmt fmt[2];
> +	int fd_flags = fcntl(fd.g_fd(), F_GETFL);
> +
> +	fd.g_fmt(fmt[OUT], out.g_type());
> +	fd.g_fmt(fmt[CAP], in.g_type());
> +
> +	if (out.reqbufs(&fd, reqbufs_count_out)) {
> +		fprintf(stderr, "%s: out.reqbufs failed\n", __func__);
> +		return;
> +	}
> +
> +	if (in.reqbufs(&fd, reqbufs_count_cap)) {
> +		fprintf(stderr, "%s: in.reqbufs failed\n", __func__);
> +		return;
> +	}
> +
> +	if (exp_fd_p && in.export_bufs(exp_fd_p, exp_fd_p->g_type()))
> +		return;
> +
> +	if (in.obtain_bufs(&fd)) {
> +		fprintf(stderr, "%s: in.obtain_bufs error\n", __func__);
> +		return;
> +	}
> +
> +	if (do_setup_out_buffers(fd, out, fout, true) == -1) {
> +		fprintf(stderr, "%s: do_setup_out_buffers failed\n", __func__);
> +		return;
> +	}
> +
> +	if (in.queue_all(&fd)) {
> +		fprintf(stderr, "%s: in.queue_all failed\n", __func__);
> +		return;
> +	}
> +
> +	if (fd.streamon(out.g_type())) {
> +		fprintf(stderr, "%s: streamon for out failed\n", __func__);
> +		return;
> +	}
> +
> +	if (fd.streamon(in.g_type())) {
> +		fprintf(stderr, "%s: streamon for in failed\n", __func__);
> +		return;
> +	}
> +	int index = 0;
> +	bool queue_lst_buf = false;
> +	cv4l_buffer last_in_buf;
> +
> +	fcntl(fd.g_fd(), F_SETFL, fd_flags | O_NONBLOCK);
> +
> +	while (true) {
> +		fd_set except_fds;
> +		int req_fd =fwht_reqs[index].fd;
> +		struct timeval tv = { 2, 0 };
> +
> +		FD_ZERO(&except_fds);
> +		FD_SET(req_fd, &except_fds);
> +
> +		int rc = select(req_fd + 1, NULL, NULL, &except_fds, &tv);
> +
> +		if (rc == 0) {
> +			fprintf(stderr, "Timeout when waiting for media request\n");
> +			return;
> +		} else if (rc < 0) {
> +			fprintf(stderr, "Unable to select media request: %s\n",
> +				strerror(errno));
> +			return;
> +		}
> +		/*
> +		 * it is safe to queue back last cap buffer only after
> +		 * the following request is done so that the buffer
> +		 * is not needed anymore as a reference frame
> +		 */
> +		if (queue_lst_buf) {
> +			if (fd.qbuf(last_in_buf) < 0) {
> +				fprintf(stderr, "%s: qbuf failed\n", __func__);
> +				return;
> +			}
> +		}
> +		int buf_idx = -1;
> +		  /*
> +		   * fin is not sent to do_handle_cap since the capture buf is
> +		   * written to the file in current function
> +		   */
> +		rc = do_handle_cap(fd, in, NULL, &buf_idx, count[CAP],
> +				   fps_ts[CAP], fmt[CAP]);
> +		if (rc) {
> +			fprintf(stderr, "%s: do_handle_cap err\n", __func__);
> +			return;
> +		}
> +		/*
> +		 * in case of an error in the frame, set last ts to 0 as a mean
> +		 * to recover so that next request will not use a
> +		 * reference buffer. Otherwise the error flag will be set to
> +		 * all the future capture buffers.
> +		 */
> +		if (buf_idx == -1) {
> +			fprintf(stderr, "%s: frame returned with error\n", __func__);
> +			last_fwht_bf_ts	= 0;
> +		} else {
> +			cv4l_buffer cap_buf(in, index);
> +			if (fd.querybuf(cap_buf))
> +				return;
> +			last_in_buf = cap_buf;
> +			queue_lst_buf = true;
> +			if (fin && cap_buf.g_bytesused(0) &&
> +			    !(cap_buf.g_flags() & V4L2_BUF_FLAG_ERROR)) {
> +				int idx = get_fwht_req_by_ts(get_ns_timestamp(cap_buf));
> +
> +				if (idx < 0) {
> +					fprintf(stderr, "%s: could not find request from buffer\n", __func__);
> +					fprintf(stderr, "%s: ts = %llu\n", __func__, get_ns_timestamp(cap_buf));
> +					return;
> +				}
> +				composed_width = fwht_reqs[idx].params.width;
> +				composed_height = fwht_reqs[idx].params.height;
> +				write_buffer_to_file(fd, in, cap_buf,
> +						     fmt[CAP], fin);
> +			}
> +		}
> +		rc = do_handle_out(fd, out, fout, NULL, count[OUT],
> +				   fps_ts[OUT], fmt[OUT]);
> +		if (rc) {
> +			fprintf(stderr, "%s: output stream ended\n", __func__);
> +			close(req_fd);
> +		}
> +		index = (index + 1) % out.g_buffers();
> +	}
> +}
> +
>  static void streaming_set_m2m(cv4l_fd &fd, cv4l_fd &exp_fd)
>  {
>  	cv4l_queue in(fd.g_type(), memory);
> @@ -2280,7 +2503,12 @@ static void streaming_set_m2m(cv4l_fd &fd, cv4l_fd &exp_fd)
>  		if (out.export_bufs(&exp_fd, exp_fd.g_type()))
>  			return;
>  	}
> -	stateful_m2m(fd, in, out, file[CAP], file[OUT], exp_fd_p);
> +	if (out.reqbufs(&fd, 0))
> +		goto done;
> +	if (out.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_REQUESTS)
> +		stateless_m2m(fd, in, out, file[CAP], file[OUT], exp_fd_p);
> +	else
> +		stateful_m2m(fd, in, out, file[CAP], file[OUT], exp_fd_p);
>  done:
>  	if (options[OptStreamDmaBuf] || options[OptStreamOutDmaBuf])
>  		exp_q.close_exported_fds();
> 

Regards,

	Hans