c7f6fb90cb
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>
207 lines
6.9 KiB
C
207 lines
6.9 KiB
C
/* SPDX-License-Identifier: GPL-2.0-or-later WITH Linux-syscall-note */
|
|
/*
|
|
* daedalus-v4l2 — kernel ↔ daemon wire protocol.
|
|
*
|
|
* Shared header used by both the kernel module
|
|
* (drivers/daedalus_v4l2_chardev.c) and the userspace daemon
|
|
* (daemon/src/main.c). ABI: pre-1.0 — no stability guarantees
|
|
* until DAEDALUS_PROTO_VERSION reaches 1.
|
|
*
|
|
* Transport: a single-instance chardev at /dev/daedalus-v4l2.
|
|
* The userspace daemon opens the chardev O_RDWR, then drives a
|
|
* blocking read() / write() loop:
|
|
*
|
|
* write(): submit a response to a prior request (RESP_*).
|
|
* read(): block until the next request from the kernel
|
|
* (REQ_*) is available.
|
|
*
|
|
* Each message is a `struct daedalus_msg_hdr` followed by an
|
|
* optional variable-length payload of `hdr.payload_len` bytes.
|
|
*
|
|
* Phase 8.2 (chardev bridge): PING / PONG.
|
|
* Phase 8.4 (decode end-to-end): REQ_DECODE / RESP_FRAME.
|
|
*/
|
|
#ifndef DAEDALUS_V4L2_PROTO_H
|
|
#define DAEDALUS_V4L2_PROTO_H
|
|
|
|
#include <linux/types.h>
|
|
|
|
#define DAEDALUS_PROTO_MAGIC 0x44303456u /* 'D04V' */
|
|
#define DAEDALUS_PROTO_VERSION 0u /* pre-1.0 */
|
|
|
|
/*
|
|
* Wire-protocol message types.
|
|
*
|
|
* Request types (kernel → daemon) live in 0x0000_0000..0x7fff_ffff.
|
|
* Response types (daemon → kernel) live in 0x8000_0000..0xffff_ffff.
|
|
* The high bit is what distinguishes "kernel produced this" from
|
|
* "daemon produced this" on the wire.
|
|
*
|
|
* These are #defines rather than an enum because the high-bit
|
|
* values (>= 0x80000000) exceed INT_MAX, and pre-C23 enums can't
|
|
* portably hold them — kernel uABI headers follow the same
|
|
* convention.
|
|
*/
|
|
#define DAEDALUS_MSG_PING 0x00000001u
|
|
#define DAEDALUS_MSG_REQ_DECODE 0x00000002u
|
|
|
|
#define DAEDALUS_MSG_HELLO 0x80000001u
|
|
#define DAEDALUS_MSG_PONG 0x80000002u
|
|
#define DAEDALUS_MSG_RESP_FRAME 0x80000003u
|
|
|
|
/**
|
|
* struct daedalus_msg_hdr - on-the-wire message header
|
|
* @magic: must be DAEDALUS_PROTO_MAGIC; rejects gibberish
|
|
* @version: protocol version (DAEDALUS_PROTO_VERSION)
|
|
* @type: one of enum daedalus_msg_type
|
|
* @cookie: caller-supplied identifier; copied verbatim into
|
|
* the matching response so the kernel can pair
|
|
* response with request
|
|
* @payload_len: number of bytes immediately following this
|
|
* struct (max DAEDALUS_PROTO_MAX_PAYLOAD)
|
|
* @reserved: must be zero for future use
|
|
*/
|
|
struct daedalus_msg_hdr {
|
|
__u32 magic;
|
|
__u32 version;
|
|
__u32 type;
|
|
__u32 cookie;
|
|
__u32 payload_len;
|
|
__u32 reserved;
|
|
};
|
|
|
|
#define DAEDALUS_PROTO_MAX_PAYLOAD (64u * 1024u) /* 64 KiB */
|
|
|
|
/* -- REQ_DECODE / RESP_FRAME payload structures ---------------------- */
|
|
|
|
/**
|
|
* enum daedalus_codec_id - codec selector for REQ_DECODE
|
|
* @DAEDALUS_CODEC_VP9: libavcodec AV_CODEC_ID_VP9
|
|
* @DAEDALUS_CODEC_AV1: libavcodec AV_CODEC_ID_AV1 (Phase 8.6)
|
|
* @DAEDALUS_CODEC_H264: libavcodec AV_CODEC_ID_H264 (Phase 8.6)
|
|
*
|
|
* Wire-stable across phases. The daemon maps these to the
|
|
* libavcodec AV_CODEC_ID_* values internally so we don't leak
|
|
* FFmpeg's enum into the kernel ABI.
|
|
*/
|
|
enum daedalus_codec_id {
|
|
DAEDALUS_CODEC_VP9 = 1,
|
|
DAEDALUS_CODEC_AV1 = 2,
|
|
DAEDALUS_CODEC_H264 = 3,
|
|
};
|
|
|
|
/**
|
|
* struct daedalus_req_decode - REQ_DECODE payload prefix
|
|
* @codec_id: enum daedalus_codec_id
|
|
* @bitstream_len: bytes of bitstream following this struct
|
|
* @capture_width: CAPTURE buffer width in pixels
|
|
* @capture_height: CAPTURE buffer height in pixels
|
|
* @capture_pix_fmt: V4L2 fourcc of the CAPTURE format
|
|
* (e.g. V4L2_PIX_FMT_NV12M)
|
|
* @capture_num_planes: number of dmabuf planes the daemon should
|
|
* fetch via DAEDALUS_IOC_GET_DMABUF (1..3)
|
|
* @capture_plane_size: per-plane sizeimage from V4L2 S_FMT
|
|
* (plane[0..N-1]). Unused entries = 0.
|
|
* @capture_plane_stride: per-plane bytesperline from V4L2 S_FMT.
|
|
* @flags: reserved, must be zero
|
|
*
|
|
* Total payload_len for a REQ_DECODE = sizeof(struct
|
|
* daedalus_req_decode) + bitstream_len.
|
|
*
|
|
* The daemon uses (capture_*) to fetch + mmap the right CAPTURE
|
|
* plane via DAEDALUS_IOC_GET_DMABUF, then decodes pixels
|
|
* directly into the dmabuf.
|
|
*/
|
|
struct daedalus_req_decode {
|
|
__u32 codec_id;
|
|
__u32 bitstream_len;
|
|
__u32 capture_width;
|
|
__u32 capture_height;
|
|
__u32 capture_pix_fmt;
|
|
__u32 capture_num_planes;
|
|
__u32 capture_plane_size[3];
|
|
__u32 capture_plane_stride[3];
|
|
__u32 flags;
|
|
};
|
|
|
|
/**
|
|
* enum daedalus_decode_status - RESP_FRAME outcome codes
|
|
* @DAEDALUS_DECODE_OK: frame produced; fields below populated
|
|
* @DAEDALUS_DECODE_NO_FRAME: codec consumed input but no frame
|
|
* ready yet (e.g. lacks reference)
|
|
* @DAEDALUS_DECODE_ERR_OPEN: avcodec_open2 failed
|
|
* @DAEDALUS_DECODE_ERR_SEND: avcodec_send_packet failed
|
|
* @DAEDALUS_DECODE_ERR_RECV: avcodec_receive_frame failed
|
|
* @DAEDALUS_DECODE_ERR_CODEC: unknown codec_id
|
|
*/
|
|
enum daedalus_decode_status {
|
|
DAEDALUS_DECODE_OK = 0,
|
|
DAEDALUS_DECODE_NO_FRAME = 1,
|
|
DAEDALUS_DECODE_ERR_OPEN = 100,
|
|
DAEDALUS_DECODE_ERR_SEND = 101,
|
|
DAEDALUS_DECODE_ERR_RECV = 102,
|
|
DAEDALUS_DECODE_ERR_CODEC = 103,
|
|
};
|
|
|
|
/**
|
|
* struct daedalus_resp_frame - RESP_FRAME payload
|
|
* @status: enum daedalus_decode_status
|
|
* @codec_id: echoes the request's codec_id
|
|
* @width: decoded frame width in pixels (0 if !OK)
|
|
* @height: decoded frame height in pixels (0 if !OK)
|
|
* @pix_fmt: libavcodec AVPixelFormat as int (informational)
|
|
* @luma_len: Y-plane byte count actually hashed
|
|
* @chroma_len: U+V byte count actually hashed (planar combined)
|
|
* @fnv1a_yuv: FNV-1a 32-bit hash of Y,U,V planes concatenated
|
|
* (line-by-line, stripping any libav alignment
|
|
* stride padding). Lets the kernel side compare
|
|
* against an offline reference without shipping
|
|
* full pixel data through the chardev.
|
|
* @reserved: must be zero
|
|
*
|
|
* Fixed size — keeps wire parsing simple. No variable-length
|
|
* pixel data in Phase 8.4; dmabuf in Phase 8.5 carries that.
|
|
*/
|
|
struct daedalus_resp_frame {
|
|
__u32 status;
|
|
__u32 codec_id;
|
|
__u32 width;
|
|
__u32 height;
|
|
__s32 pix_fmt;
|
|
__u32 luma_len;
|
|
__u32 chroma_len;
|
|
__u32 fnv1a_yuv;
|
|
__u32 reserved;
|
|
};
|
|
|
|
/* -- chardev ioctl ABI ----------------------------------------------- */
|
|
|
|
/**
|
|
* struct daedalus_get_dmabuf - DAEDALUS_IOC_GET_DMABUF args
|
|
* @cookie: cookie from the matching REQ_DECODE (in)
|
|
* @plane: plane index, 0-based (in)
|
|
* @flags: O_CLOEXEC etc.; passed through to dma_buf_fd (in)
|
|
* @fd: exported dmabuf fd, installed in the calling
|
|
* (daemon) task's fd table (out)
|
|
*
|
|
* The daemon calls this ioctl from REQ_DECODE handling to obtain
|
|
* a per-plane dmabuf fd for the CAPTURE buffer the kernel
|
|
* scheduled. The kernel resolves cookie → in-flight V4L2
|
|
* request → CAPTURE vb2 buffer, then calls vb2_core_expbuf in
|
|
* the daemon's task context (so the fd lands in the daemon's
|
|
* fd table). Daemon mmaps the fd, writes decoded pixels in
|
|
* place, munmaps and close()s — then sends RESP_FRAME.
|
|
*/
|
|
struct daedalus_get_dmabuf {
|
|
__u32 cookie;
|
|
__u32 plane;
|
|
__u32 flags;
|
|
__s32 fd;
|
|
};
|
|
|
|
#define DAEDALUS_IOC_MAGIC 'D'
|
|
#define DAEDALUS_IOC_GET_DMABUF \
|
|
_IOWR(DAEDALUS_IOC_MAGIC, 1, struct daedalus_get_dmabuf)
|
|
|
|
#endif /* DAEDALUS_V4L2_PROTO_H */
|