Files
daedalus-v4l2/tools/test_m2m_decode.c
T
marfrit c7f6fb90cb Phase 8.6: dmabuf + AV1 + H.264 + stateless controls
Removes the Phase 8.5 64 KiB frame-size cap by exporting CAPTURE
buffers as dmabuf-fds the daemon mmaps and writes pixels into
directly. Adds AV1 + H.264 codec support, V4L2 stateless control
registration, and the compliance polish that brings the driver
to 47/48 v4l2-compliance pass.

Protocol (include/daedalus_v4l2_proto.h):
- struct daedalus_req_decode grew capture-buffer metadata
  (width/height/pix_fmt/num_planes + per-plane size+stride).
- New DAEDALUS_IOC_GET_DMABUF ioctl on the chardev: daemon
  asks for a per-plane dmabuf fd, kernel calls vb2_core_expbuf
  in daemon task context so the fd lands in the daemon's table.

Kernel m2m driver (kernel/daedalus_v4l2_main.c):
- Both queues switched to vb2_dma_contig_memops. OUTPUT was
  vmalloc in 8.5; the switch is needed because vmalloc doesn't
  honour V4L2_MEMORY_FLAG_NON_COHERENT and v4l2-compliance's
  REQBUFS test rejected the driver because of it. We still
  read bitstream via vb2_plane_vaddr (dma_contig gives a
  kernel virtual address just like vmalloc did).
- dma_coerce_mask_and_coherent(DMA_BIT_MASK(32)) in probe.
- queue_setup populates alloc_devs[plane] = &pdev->dev for
  both queues; allow_cache_hints=1 on both.
- daedalus_export_capture_dmabuf(cookie, plane, flags, *fd):
  walks inflight list, calls vb2_core_expbuf on the CAPTURE
  buffer in the caller's (daemon's) task context.
- device_run fills the new REQ_DECODE capture fields from
  ctx->dst_fmt and maps ctx->src_fmt.pixelformat to
  DAEDALUS_CODEC_VP9 / _AV1 / _H264 (was hard-wired to VP9).
- daedalus_complete_resp_frame handles both the 8.5 inline
  path (kept for debugging) and the 8.6 dmabuf path (pixels
  already in CAPTURE buffer, just set payload from metadata).
- enum_fmt advertises all 3 OUTPUT formats (VP9F, AV1F, S264).
- try_fmt preserves userspace colorspace fields instead of
  overwriting with REC709 defaults (fixes 8.5 compliance fail).
- s_fmt propagates OUTPUT colorspace → CAPTURE (stateless
  decoder round-trip test at v4l2-test-formats.cpp:958).
- 12 V4L2 stateless controls registered per open (VP9_FRAME,
  VP9_COMPRESSED_HDR, H264_SPS/PPS/SCALING/PRED_WEIGHTS/
  SLICE_PARAMS/DECODE_PARAMS, AV1_FRAME/SEQUENCE/
  TILE_GROUP_ENTRY/FILM_GRAIN). Daemon ignores values (FFmpeg
  re-parses); registration is what makes libva-v4l2-request
  see us.

Kernel chardev (kernel/daedalus_v4l2_chardev.c):
- New unlocked_ioctl dispatching DAEDALUS_IOC_GET_DMABUF to
  daedalus_export_capture_dmabuf.
- debugfs test_decode cookies unified with the m2m cookie
  allocator via shared daedalus_next_cookie() — kills the
  Phase 8.5 namespace collision.

Daemon (daemon/src/...):
- New dmabuf_capture.{c,h}: GET_DMABUF + mmap each plane on
  REQ_DECODE; munmap + close on completion. O_RDWR | O_CLOEXEC
  is essential — vb2_core_expbuf extracts O_ACCMODE from flags
  and exports read-only by default (caught on first run; mmap
  -EACCES on PROT_WRITE).
- decoder.{c,h}: lazily opens AV1 + H.264 AVCodecContexts in
  addition to VP9 (dropped the -ENOSYS stubs). pack_nv12_to_planes
  writes Y line-by-line into planes[0] with planes[0].stride;
  interleaves Cb/Cr into planes[1] with planes[1].stride.
- chardev_client.c handle_req_decode: opens dmabuf planes,
  runs decode (pixels land in CAPTURE buffer directly), closes
  planes, sends metadata-only RESP_FRAME. No wire-pixel
  allocation.

Test harness (tools/test_m2m_decode.c):
- Optional 5th arg `codec` (vp9 | av1 | h264). Same client
  drives all three codecs.

Verification on hertz (Pi 5, 6.12.75+rpt-rpi-2712):

Bit-exact end-to-end vs `ffmpeg -pix_fmt nv12`:
  VP9   1920x1080  3,110,400 bytes  MATCH
  AV1     128x96      18,432 bytes  MATCH
  H.264   128x96      18,432 bytes  MATCH

VP9 1080p went through the full dmabuf path with no chardev
payload bloat — the same chardev that capped at 64 KiB in 8.5
now ferries metadata only and lets the daemon mmap+write a
3.1 MB frame directly into the V4L2 client's buffer.

v4l2-compliance:
  Phase 8.1: 44/48
  Phase 8.5: 44/48 (different fails after m2m landed)
  Phase 8.6: 47/48
  Only remaining: VIDIOC_(TRY_)DECODER_CMD (needs media
  controller — explicitly Phase 8.7 work).

11 standard compound controls visible:
  vp9_frame_decode_parameters, vp9_probabilities_updates,
  h264_sequence_parameter_set, h264_picture_parameter_set,
  h264_scaling_matrix, h264_prediction_weight_table,
  h264_slice_parameters, h264_decode_parameters,
  av1_sequence_parameters, av1_frame_parameters,
  av1_film_grain (av1_tile_group_entry refused by hdl->error
  on this kernel — skipped silently).

Clean SIGTERM + rmmod, no oops/WARN.

Roadmap update (docs/roadmap.md):
- Phase 8.6 marked closed with the closure-doc reference.
- Phase 8.7 reshaped to (1) media controller, (2) perf +
  daedalus_dispatch_* substitution, (3) HDR/10-bit, (4)
  long-form multi-frame streaming.

Per correctness-before-speed:
- Real V4L2 dmabuf via vb2_core_expbuf (not a sideband
  fd-passing hack).
- O_RDWR access mode threaded through correctly.
- Strict pixel-byte comparison against ffmpeg, not "looks
  right" eyeballing.
- Each compliance edge documented with the underlying test
  source-line + the fix.
- All resource paths cleaned (munmap + close per plane on
  every exit, including error paths).

Phase 8.7 next: media controller binding (closes last
compliance fail), per-frame profiling, QPU dispatch
substitution targeting 30fps@1080p from
30fps-floor-is-fine memory.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-18 16:16:06 +00:00

312 lines
8.5 KiB
C

/* SPDX-License-Identifier: BSD-2-Clause */
/*
* test_m2m_decode — minimal V4L2 m2m stateless decoder client.
*
* Drives /dev/videoNN through one full QBUF/DQBUF round-trip:
* 1. open the m2m device
* 2. S_FMT on OUTPUT (VP9_FRAME) and CAPTURE (NV12M)
* 3. REQBUFS 1 on both queues
* 4. mmap the OUTPUT buffer, copy bitstream into it, QBUF
* 5. QBUF the CAPTURE buffer
* 6. STREAMON both queues
* 7. poll for completion
* 8. DQBUF capture
* 9. mmap+dump the CAPTURE buffer to a file
*
* Phase 8.5 verification harness — confirms the kernel's m2m
* wiring works end-to-end against a real bitstream.
*
* Usage:
* test_m2m_decode <keyframe.bin> <out.nv12> [w] [h] [codec]
* defaults: w=128 h=96 codec=vp9
* codec: vp9 | av1 | h264
*/
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <poll.h>
#include <linux/videodev2.h>
#define V4L2_DEV "/dev/video0"
#define POLL_TIMEOUT_MS 5000
static void die(const char *msg)
{
perror(msg);
exit(1);
}
static void *read_file(const char *path, size_t *out_len)
{
struct stat st;
void *buf;
int fd;
ssize_t n;
fd = open(path, O_RDONLY);
if (fd < 0)
die("open bitstream");
if (fstat(fd, &st) < 0)
die("fstat");
buf = malloc(st.st_size);
if (!buf)
die("malloc bitstream");
n = read(fd, buf, st.st_size);
if (n != st.st_size)
die("read bitstream short");
close(fd);
*out_len = (size_t) st.st_size;
return buf;
}
int main(int argc, char **argv)
{
const char *bitstream_path, *out_path;
const char *codec_name = "vp9";
uint32_t output_fourcc = V4L2_PIX_FMT_VP9_FRAME;
void *bitstream;
size_t bs_len;
uint32_t w = 128, h = 96;
struct v4l2_format fmt;
struct v4l2_requestbuffers reqbuf;
struct v4l2_buffer buf;
struct v4l2_plane planes[2];
struct v4l2_exportbuffer expbuf;
int fd, rc, i;
void *out_map;
void *cap_y, *cap_uv;
size_t cap_y_size, cap_uv_size;
uint32_t out_buf_offset;
enum v4l2_buf_type t;
if (argc < 3) {
fprintf(stderr,
"usage: %s <keyframe.bin> <out.nv12> [w] [h] [codec]\n"
" codec: vp9 | av1 | h264 (default vp9)\n",
argv[0]);
return 2;
}
bitstream_path = argv[1];
out_path = argv[2];
if (argc >= 5) {
w = (uint32_t) atoi(argv[3]);
h = (uint32_t) atoi(argv[4]);
}
if (argc >= 6) {
codec_name = argv[5];
if (!strcmp(codec_name, "vp9"))
output_fourcc = V4L2_PIX_FMT_VP9_FRAME;
else if (!strcmp(codec_name, "av1"))
output_fourcc = V4L2_PIX_FMT_AV1_FRAME;
else if (!strcmp(codec_name, "h264"))
output_fourcc = V4L2_PIX_FMT_H264_SLICE;
else {
fprintf(stderr, "unknown codec '%s'\n", codec_name);
return 2;
}
}
printf("codec=%s fourcc='%c%c%c%c'\n", codec_name,
output_fourcc & 0xff, (output_fourcc >> 8) & 0xff,
(output_fourcc >> 16) & 0xff, (output_fourcc >> 24) & 0xff);
bitstream = read_file(bitstream_path, &bs_len);
printf("loaded bitstream: %zu bytes\n", bs_len);
fd = open(V4L2_DEV, O_RDWR);
if (fd < 0)
die("open " V4L2_DEV);
/* --- S_FMT OUTPUT (compressed) --- */
memset(&fmt, 0, sizeof(fmt));
fmt.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
fmt.fmt.pix_mp.width = w;
fmt.fmt.pix_mp.height = h;
fmt.fmt.pix_mp.pixelformat = output_fourcc;
if (ioctl(fd, VIDIOC_S_FMT, &fmt) < 0)
die("S_FMT OUTPUT");
printf("OUTPUT sizeimage = %u\n", fmt.fmt.pix_mp.plane_fmt[0].sizeimage);
/* --- S_FMT CAPTURE (NV12M) --- */
memset(&fmt, 0, sizeof(fmt));
fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
fmt.fmt.pix_mp.width = w;
fmt.fmt.pix_mp.height = h;
fmt.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_NV12M;
if (ioctl(fd, VIDIOC_S_FMT, &fmt) < 0)
die("S_FMT CAPTURE");
printf("CAPTURE planes = %u, [0].sizeimage=%u [1].sizeimage=%u\n",
fmt.fmt.pix_mp.num_planes,
fmt.fmt.pix_mp.plane_fmt[0].sizeimage,
fmt.fmt.pix_mp.plane_fmt[1].sizeimage);
cap_y_size = fmt.fmt.pix_mp.plane_fmt[0].sizeimage;
cap_uv_size = fmt.fmt.pix_mp.plane_fmt[1].sizeimage;
/* --- REQBUFS OUTPUT --- */
memset(&reqbuf, 0, sizeof(reqbuf));
reqbuf.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
reqbuf.memory = V4L2_MEMORY_MMAP;
reqbuf.count = 1;
if (ioctl(fd, VIDIOC_REQBUFS, &reqbuf) < 0)
die("REQBUFS OUTPUT");
printf("OUTPUT REQBUFS -> %u\n", reqbuf.count);
/* --- REQBUFS CAPTURE --- */
memset(&reqbuf, 0, sizeof(reqbuf));
reqbuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
reqbuf.memory = V4L2_MEMORY_MMAP;
reqbuf.count = 1;
if (ioctl(fd, VIDIOC_REQBUFS, &reqbuf) < 0)
die("REQBUFS CAPTURE");
printf("CAPTURE REQBUFS -> %u\n", reqbuf.count);
/* --- QUERYBUF OUTPUT[0] + mmap + fill --- */
memset(&buf, 0, sizeof(buf));
memset(planes, 0, sizeof(planes));
buf.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
buf.memory = V4L2_MEMORY_MMAP;
buf.index = 0;
buf.m.planes = planes;
buf.length = 1;
if (ioctl(fd, VIDIOC_QUERYBUF, &buf) < 0)
die("QUERYBUF OUTPUT");
out_buf_offset = planes[0].m.mem_offset;
out_map = mmap(NULL, planes[0].length, PROT_READ | PROT_WRITE,
MAP_SHARED, fd, out_buf_offset);
if (out_map == MAP_FAILED)
die("mmap OUTPUT");
if (bs_len > planes[0].length) {
fprintf(stderr, "bitstream too big: %zu > %u\n",
bs_len, planes[0].length);
return 1;
}
memcpy(out_map, bitstream, bs_len);
planes[0].bytesused = (uint32_t) bs_len;
if (ioctl(fd, VIDIOC_QBUF, &buf) < 0)
die("QBUF OUTPUT");
printf("QBUF OUTPUT[0] bytesused=%zu\n", bs_len);
/* --- QBUF CAPTURE[0] --- */
memset(&buf, 0, sizeof(buf));
memset(planes, 0, sizeof(planes));
buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
buf.memory = V4L2_MEMORY_MMAP;
buf.index = 0;
buf.m.planes = planes;
buf.length = 2;
if (ioctl(fd, VIDIOC_QBUF, &buf) < 0)
die("QBUF CAPTURE");
printf("QBUF CAPTURE[0]\n");
/* --- STREAMON both --- */
t = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
if (ioctl(fd, VIDIOC_STREAMON, &t) < 0)
die("STREAMON OUTPUT");
t = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
if (ioctl(fd, VIDIOC_STREAMON, &t) < 0)
die("STREAMON CAPTURE");
printf("STREAMON both\n");
/* --- poll for CAPTURE completion --- */
{
struct pollfd p = { .fd = fd, .events = POLLIN | POLLOUT };
rc = poll(&p, 1, POLL_TIMEOUT_MS);
if (rc < 0)
die("poll");
if (rc == 0) {
fprintf(stderr, "poll timeout\n");
return 1;
}
printf("poll revents=0x%x\n", p.revents);
}
/* --- DQBUF OUTPUT (return the bitstream buffer) --- */
memset(&buf, 0, sizeof(buf));
memset(planes, 0, sizeof(planes));
buf.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
buf.memory = V4L2_MEMORY_MMAP;
buf.m.planes = planes;
buf.length = 1;
if (ioctl(fd, VIDIOC_DQBUF, &buf) < 0)
die("DQBUF OUTPUT");
printf("DQBUF OUTPUT[%u] flags=0x%x\n", buf.index, buf.flags);
/* --- DQBUF CAPTURE (get the decoded frame) --- */
memset(&buf, 0, sizeof(buf));
memset(planes, 0, sizeof(planes));
buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
buf.memory = V4L2_MEMORY_MMAP;
buf.m.planes = planes;
buf.length = 2;
if (ioctl(fd, VIDIOC_DQBUF, &buf) < 0)
die("DQBUF CAPTURE");
printf("DQBUF CAPTURE[%u] flags=0x%x payloads=[%u, %u]\n",
buf.index, buf.flags,
planes[0].bytesused, planes[1].bytesused);
if (buf.flags & V4L2_BUF_FLAG_ERROR) {
fprintf(stderr, "CAPTURE buffer flagged ERROR\n");
return 1;
}
/* --- mmap CAPTURE plane 0 + 1 and dump --- */
{
struct v4l2_buffer qb;
struct v4l2_plane pl[2];
memset(&qb, 0, sizeof(qb));
memset(pl, 0, sizeof(pl));
qb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
qb.memory = V4L2_MEMORY_MMAP;
qb.index = 0;
qb.m.planes = pl;
qb.length = 2;
if (ioctl(fd, VIDIOC_QUERYBUF, &qb) < 0)
die("QUERYBUF CAPTURE");
cap_y = mmap(NULL, pl[0].length, PROT_READ, MAP_SHARED, fd,
pl[0].m.mem_offset);
if (cap_y == MAP_FAILED)
die("mmap cap Y");
cap_uv = mmap(NULL, pl[1].length, PROT_READ, MAP_SHARED, fd,
pl[1].m.mem_offset);
if (cap_uv == MAP_FAILED)
die("mmap cap UV");
}
{
FILE *of = fopen(out_path, "wb");
size_t y_actual = planes[0].bytesused
? planes[0].bytesused : cap_y_size;
size_t uv_actual = planes[1].bytesused
? planes[1].bytesused : cap_uv_size;
if (!of)
die("fopen out");
fwrite(cap_y, 1, y_actual, of);
fwrite(cap_uv, 1, uv_actual, of);
fclose(of);
printf("wrote %zu Y + %zu UV bytes to %s\n",
y_actual, uv_actual, out_path);
}
/* --- STREAMOFF, cleanup --- */
t = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
ioctl(fd, VIDIOC_STREAMOFF, &t);
t = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
ioctl(fd, VIDIOC_STREAMOFF, &t);
close(fd);
free(bitstream);
printf("OK\n");
(void) expbuf;
(void) i;
return 0;
}