Merge pull request 'daedalus-v4l2{,-dkms}: 3dd0eb0 -> 462aa4b — kernel ctrl-binding fix' (#54) from claude-noether/marfrit-packages:noether/daedalus-bump-462aa4b into main

Reviewed-on: marfrit/marfrit-packages#54
2026-05-20 18:45:09 +00:00
parent 793187ff9e 70c8c2b417
commit 2028eccc3c
6 changed files with 37 additions and 8 deletions
@@ -18,9 +18,9 @@ _module=daedalus_v4l2

 # Same pin as arch/daedalus-v4l2 — keep kernel module + daemon
 # bit-versioned together so the chardev wire protocol stays in sync.
-_commit=3dd0eb070a75893f78368ce819b9e9ebf08c124d
+_commit=462aa4b4804972189d2f1b1ab5782f1ca1e8c423

-pkgver=0.1.0.r20.3dd0eb0
+pkgver=0.1.0.r22.462aa4b
 pkgrel=1  # reset for new upstream pin (3dd0eb0 — DAEMON-PPS H.264 SPS/PPS NAL synth)
 pkgdesc="V4L2 stateless decoder shim kernel module (DKMS) — Pi 5 / CM5"
 arch=('any')
@@ -21,11 +21,11 @@ _upstreampkg=daedalus-v4l2
 # ffmpeg -hwaccel vaapi → libva → /dev/video0 → daemon path lands a
 # pixel-correct decoded frame back in ffmpeg.  Promote to a later pin
 # only after a future phase closes cleanly.
-_commit=3dd0eb070a75893f78368ce819b9e9ebf08c124d
+_commit=462aa4b4804972189d2f1b1ab5782f1ca1e8c423

 # 0.1.0 (pre-1.0) + commit count + short sha.  Bump the .Y on each
 # Phase 8.x close.  pkgver() recomputes at build time.
-pkgver=0.1.0.r20.3dd0eb0
+pkgver=0.1.0.r22.462aa4b
 pkgrel=1  # reset for new upstream pin (3dd0eb0 — DAEMON-PPS H.264 SPS/PPS NAL synth)
 pkgdesc="Userspace daemon for the daedalus-v4l2 V4L2 stateless decoder shim (VP9/AV1/H.264 on Pi 5 / CM5)"
 arch=('aarch64')
@@ -14,8 +14,8 @@
 # Sibling userspace package: ../daedalus-v4l2/build-deb.sh
 set -euo pipefail

-UPSTREAM_COMMIT=3dd0eb070a75893f78368ce819b9e9ebf08c124d
-PKGVER=0.1.0+r20+g3dd0eb0
+UPSTREAM_COMMIT=462aa4b4804972189d2f1b1ab5782f1ca1e8c423
+PKGVER=0.1.0+r22+g462aa4b
 PKGREL=1  # reset for new upstream pin (3dd0eb0 — DAEMON-PPS H.264 SPS/PPS NAL synth)
 MODULE_NAME=daedalus_v4l2

@@ -1,3 +1,16 @@
+daedalus-v4l2-dkms (0.1.0+r22+g462aa4b-1) bookworm trixie; urgency=medium
+
+  * Bump to 462aa4b — kernel device_run() now calls
+    v4l2_ctrl_request_setup() before reading the H.264 stateless
+    control values from the bound media_request, so the values
+    daedalus ships to the userspace daemon match what the V4L2
+    client (libva-v4l2-request-fourier) actually set.  Closes the
+    libva→kernel control-binding gap that was causing decoded
+    frames to come back as best-effort zero garbage from libavcodec.
+  * Wire-ABI lockstep with daedalus-v4l2 0.1.0+r22+g462aa4b.
+
+ -- Markus Fritsche <mfritsche@reauktion.de>  Wed, 20 May 2026 22:00:00 +0000
+
 daedalus-v4l2-dkms (0.1.0+r20+g3dd0eb0-1) bookworm trixie; urgency=medium

  * Bump to 3dd0eb0 — DAEMON-PPS kernel-side changes.  device_run()
@@ -15,8 +15,8 @@ set -euo pipefail
 # end-to-end via libva (consumer target hit)" — first commit where the
 # full ffmpeg -hwaccel vaapi → libva → /dev/video0 → daemon path lands
 # a pixel-correct decoded frame back in ffmpeg.
-UPSTREAM_COMMIT=3dd0eb070a75893f78368ce819b9e9ebf08c124d
-PKGVER=0.1.0+r20+g3dd0eb0
+UPSTREAM_COMMIT=462aa4b4804972189d2f1b1ab5782f1ca1e8c423
+PKGVER=0.1.0+r22+g462aa4b
 PKGREL=1  # reset for new upstream pin (3dd0eb0 — DAEMON-PPS H.264 SPS/PPS NAL synth)

 HERE=$(dirname "$(readlink -f "$0")")
@@ -1,3 +1,19 @@
+daedalus-v4l2 (0.1.0+r22+g462aa4b-1) bookworm trixie; urgency=medium
+
+  * Bump to 462aa4b — kernel-side fix for control-binding gap that
+    closes the libva→daemon SPS/PPS pipeline.  Kernel device_run now
+    calls v4l2_ctrl_request_setup() before reading ctrl->p_cur, so
+    the daemon's daedalus_h264_meta block actually carries THIS
+    request's V4L2 stateless H.264 control values instead of stale
+    /default ones.  Pairs with libva-v4l2-request-fourier r382+gc1bb444
+    (Fix 3 + Fix 4 from issue libva-v4l2-request-fourier#8).
+  * After-fix on higgs (Pi CM5): ffmpeg -hwaccel vaapi -i h264.mp4
+    produces unique decoded P-frames (per-frame fnv1a hashes differ)
+    and zero "error while decoding MB" / "reference frames exceeds
+    max" warnings.
+
+ -- Markus Fritsche <mfritsche@reauktion.de>  Wed, 20 May 2026 22:00:00 +0000
+
 daedalus-v4l2 (0.1.0+r20+g3dd0eb0-1) bookworm trixie; urgency=medium

  * Bump to 3dd0eb0 — DAEMON-PPS H.264 SPS/PPS NAL synthesiser.