forked from marfrit/marfrit-packages
Compare commits
26 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ce2fff1a4f | |||
| 9301894997 | |||
| f21c1ff80a | |||
| e15b887d8d | |||
| b69db65037 | |||
| adcc824bf7 | |||
| 7213b23861 | |||
| 2cd3acd680 | |||
| 22ac3c9845 | |||
| 3275d06728 | |||
| 33b91cf7dc | |||
| a640633ea7 | |||
| 5f21a71770 | |||
| de3c2c6744 | |||
| e7e79e5a76 | |||
| 130a259c69 | |||
| 9580f33cb6 | |||
| eab66cfab8 | |||
| d2cecbcd05 | |||
| 2028eccc3c | |||
| 70c8c2b417 | |||
| 793187ff9e | |||
| 42bf6b1633 | |||
| 40719efc43 | |||
| e540384f50 | |||
| 9ca97374c8 |
+38
-30
@@ -924,11 +924,20 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
retry pacman -Syu --noconfirm --needed \
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
dpkg openssh rsync curl base-devel git nasm yasm \
|
retry apt-get update -qq
|
||||||
linux-api-headers mesa alsa-lib bzip2 fontconfig fribidi gmp \
|
# Debian build-deps for the FFmpeg fourier-fork build. These
|
||||||
gnutls lame libass dav1d libdrm freetype2 libpulse libva \
|
# map 1:1 to the previous Arch list; libav*-dev intentionally
|
||||||
libvorbis libvpx libwebp x264 x265 libxml2 opus v4l-utils xz zlib
|
# absent (we are FFmpeg itself, providing those libs).
|
||||||
|
retry apt-get install -y --no-install-recommends \
|
||||||
|
build-essential git pkg-config nasm yasm \
|
||||||
|
linux-libc-dev libgl1-mesa-dev libasound2-dev libbz2-dev \
|
||||||
|
libfontconfig-dev libfribidi-dev libgmp-dev libgnutls28-dev \
|
||||||
|
libmp3lame-dev libass-dev libdav1d-dev libdrm-dev \
|
||||||
|
libfreetype-dev libpulse-dev libva-dev libvorbis-dev libvpx-dev \
|
||||||
|
libwebp-dev libx264-dev libx265-dev libxml2-dev libopus-dev \
|
||||||
|
v4l-utils liblzma-dev zlib1g-dev \
|
||||||
|
curl ca-certificates openssh-client rsync dpkg-dev
|
||||||
|
|
||||||
- name: install hertz deploy ssh key
|
- name: install hertz deploy ssh key
|
||||||
if: steps.skip-check.outputs.skip != '1'
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
@@ -1063,31 +1072,30 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
retry pacman -Syu --noconfirm --needed \
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
dpkg openssh rsync curl base-devel git meson ninja python-docutils \
|
retry apt-get update -qq
|
||||||
ladspa wayland-protocols vulkan-headers \
|
# Debian libav*-dev is ABI-compatible with the fourier ffmpeg
|
||||||
alsa-lib desktop-file-utils glibc hicolor-icon-theme jack lcms2 \
|
# fork at the header level; mpv link-binds against system
|
||||||
libarchive libass libbluray libcdio libcdio-paranoia libdisplay-info \
|
# libav at build time, runtime dlopen picks up the fourier
|
||||||
libdrm libdvdnav libdvdread libegl libgl libglvnd libjpeg-turbo \
|
# libs if installed. The previous [marfrit] pre-install of
|
||||||
libplacebo libpulse libsixel libva libvdpau libx11 libxext \
|
# ffmpeg-v4l2-request-fourier under pacman is unnecessary
|
||||||
libxkbcommon libxpresent libxrandr libxss libxv luajit mesa mujs \
|
# under apt: stock Debian libav*-dev provides the trixie
|
||||||
libpipewire rubberband sdl2 openal uchardet vapoursynth \
|
# ABI mpv-fourier's binary will encounter.
|
||||||
vulkan-icd-loader wayland zlib
|
retry apt-get install -y --no-install-recommends \
|
||||||
|
build-essential git meson ninja-build pkg-config python3-docutils \
|
||||||
- name: configure [marfrit] repo + pre-install ffmpeg-v4l2-request-fourier
|
ladspa-sdk wayland-protocols libvulkan-dev libwayland-dev \
|
||||||
if: steps.skip-check.outputs.skip != '1'
|
libasound2-dev desktop-file-utils libc6-dev hicolor-icon-theme \
|
||||||
run: |
|
libjack-jackd2-dev liblcms2-dev libarchive-dev libass-dev \
|
||||||
set -e
|
libbluray-dev libcdio-dev libcdio-paranoia-dev libdisplay-info-dev \
|
||||||
curl -sLo /tmp/marfrit.gpg https://packages.reauktion.de/marfrit.gpg
|
libdrm-dev libdvdnav-dev libdvdread-dev libegl-dev libgl-dev \
|
||||||
pacman-key --add /tmp/marfrit.gpg
|
libglvnd-dev libjpeg-dev libplacebo-dev libpulse-dev libsixel-dev \
|
||||||
pacman-key --lsign-key 92D5E96D8F63C75E4116AA1FF5C8C4603D0D250C
|
libva-dev libvdpau-dev libx11-dev libxext-dev libxkbcommon-dev \
|
||||||
rm -f /tmp/marfrit.gpg
|
libxpresent-dev libxrandr-dev libxss-dev libxv-dev libluajit-5.1-dev \
|
||||||
if ! grep -q '^\[marfrit\]' /etc/pacman.conf; then
|
libmujs-dev libpipewire-0.3-dev librubberband-dev libsdl2-dev \
|
||||||
printf '\n[marfrit]\nServer = https://packages.reauktion.de/arch/$arch\nSigLevel = Required\n' >> /etc/pacman.conf
|
libopenal-dev libuchardet-dev libvapoursynth-dev liblzma-dev \
|
||||||
fi
|
libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev \
|
||||||
pacman -Sy --noconfirm
|
zlib1g-dev \
|
||||||
rm -f /var/cache/pacman/pkg/ffmpeg-v4l2-request-fourier-*-aarch64.pkg.tar.*
|
curl ca-certificates openssh-client rsync dpkg-dev
|
||||||
printf 'y\ny\ny\n' | pacman -S marfrit/ffmpeg-v4l2-request-fourier
|
|
||||||
|
|
||||||
- name: install hertz deploy ssh key
|
- name: install hertz deploy ssh key
|
||||||
if: steps.skip-check.outputs.skip != '1'
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
|
|||||||
@@ -18,10 +18,12 @@ _module=daedalus_v4l2
|
|||||||
|
|
||||||
# Same pin as arch/daedalus-v4l2 — keep kernel module + daemon
|
# Same pin as arch/daedalus-v4l2 — keep kernel module + daemon
|
||||||
# bit-versioned together so the chardev wire protocol stays in sync.
|
# bit-versioned together so the chardev wire protocol stays in sync.
|
||||||
_commit=3dd0eb070a75893f78368ce819b9e9ebf08c124d
|
# PROTO_VERSION 0 → 1 at this pin (H.264 B-frame reorder fix); must
|
||||||
|
# install both packages atomically.
|
||||||
|
_commit=79256dc7ef41f83873ca9c23db20f5888858e65d
|
||||||
|
|
||||||
pkgver=0.1.0.r20.3dd0eb0
|
pkgver=0.1.0.r28.79256dc
|
||||||
pkgrel=1 # reset for new upstream pin (3dd0eb0 — DAEMON-PPS H.264 SPS/PPS NAL synth)
|
pkgrel=1 # reset for new upstream pin (79256dc — H.264 B-frame reorder fix)
|
||||||
pkgdesc="V4L2 stateless decoder shim kernel module (DKMS) — Pi 5 / CM5"
|
pkgdesc="V4L2 stateless decoder shim kernel module (DKMS) — Pi 5 / CM5"
|
||||||
arch=('any')
|
arch=('any')
|
||||||
url="https://git.reauktion.de/reauktion/daedalus-v4l2"
|
url="https://git.reauktion.de/reauktion/daedalus-v4l2"
|
||||||
|
|||||||
@@ -16,17 +16,18 @@
|
|||||||
pkgname=daedalus-v4l2
|
pkgname=daedalus-v4l2
|
||||||
_upstreampkg=daedalus-v4l2
|
_upstreampkg=daedalus-v4l2
|
||||||
|
|
||||||
# Pin the daedalus-v4l2 tip. 481279c = "Phase 8.13: byte-exact end-to-
|
# Pin the daedalus-v4l2 tip. 79256dc = "kernel + daemon: H.264 B-frame
|
||||||
# end via libva (consumer target hit)" — first commit where the full
|
# display reorder fix (closes #6)" — adds the wire-protocol src_pts /
|
||||||
# ffmpeg -hwaccel vaapi → libva → /dev/video0 → daemon path lands a
|
# output_src_pts / RESP_FRAME flags split that lets H.264 streams with
|
||||||
# pixel-correct decoded frame back in ffmpeg. Promote to a later pin
|
# B-frames preserve display order through libva → kernel → daemon.
|
||||||
# only after a future phase closes cleanly.
|
# PROTO_VERSION bumps 0 → 1; lock-step userspace + kernel rebuild
|
||||||
_commit=3dd0eb070a75893f78368ce819b9e9ebf08c124d
|
# REQUIRED (daedalus-v4l2-dkms PKGBUILD pinned to the same commit).
|
||||||
|
_commit=79256dc7ef41f83873ca9c23db20f5888858e65d
|
||||||
|
|
||||||
# 0.1.0 (pre-1.0) + commit count + short sha. Bump the .Y on each
|
# 0.1.0 (pre-1.0) + commit count + short sha. Bump the .Y on each
|
||||||
# Phase 8.x close. pkgver() recomputes at build time.
|
# Phase 8.x close. pkgver() recomputes at build time.
|
||||||
pkgver=0.1.0.r20.3dd0eb0
|
pkgver=0.1.0.r28.79256dc
|
||||||
pkgrel=1 # reset for new upstream pin (3dd0eb0 — DAEMON-PPS H.264 SPS/PPS NAL synth)
|
pkgrel=1 # reset for new upstream pin (79256dc — H.264 B-frame reorder fix)
|
||||||
pkgdesc="Userspace daemon for the daedalus-v4l2 V4L2 stateless decoder shim (VP9/AV1/H.264 on Pi 5 / CM5)"
|
pkgdesc="Userspace daemon for the daedalus-v4l2 V4L2 stateless decoder shim (VP9/AV1/H.264 on Pi 5 / CM5)"
|
||||||
arch=('aarch64')
|
arch=('aarch64')
|
||||||
url="https://git.reauktion.de/reauktion/daedalus-v4l2"
|
url="https://git.reauktion.de/reauktion/daedalus-v4l2"
|
||||||
|
|||||||
@@ -18,27 +18,30 @@ This patch adds a sibling init path, `InitV4L2RequestDecoder`, that:
|
|||||||
* looks up the codec via two complementary mechanisms libavcodec
|
* looks up the codec via two complementary mechanisms libavcodec
|
||||||
uses for v4l2_request:
|
uses for v4l2_request:
|
||||||
- **named codec** (`h264_v4l2request`, `vp8_v4l2request`, etc.):
|
- **named codec** (`h264_v4l2request`, `vp8_v4l2request`, etc.):
|
||||||
the legacy AVCodec-per-hwaccel registration. ALARM, Debian,
|
the legacy AVCodec-per-hwaccel registration.
|
||||||
and most distros building with --enable-v4l2-request expose
|
- **generic codec + hw_configs walk**: the modern hwaccel
|
||||||
this (avcodec_find_decoder_by_name lookup).
|
registration. Accepts EITHER AV_HWDEVICE_TYPE_DRM (legacy
|
||||||
- **generic codec + AV_HWDEVICE_TYPE_DRM** in `hw_configs`:
|
ffmpeg-v4l2-request-fork output prior to FFmpeg 7.1) OR
|
||||||
the modern hwaccel registration on some upstream-only ffmpeg
|
AV_HWDEVICE_TYPE_V4L2REQUEST (FFmpeg 7.1+ dedicated enum,
|
||||||
builds.
|
value 13 on Kwiboo's no-AMF tree, 14 on upstream-AMF tree).
|
||||||
|
Mozilla's bundled libavutil headers may not have the V4L2REQUEST
|
||||||
|
enumerator, so the test is on the integer value via `(int)cast`.
|
||||||
Probes named-codec first (explicit, portable) and falls back to
|
Probes named-codec first (explicit, portable) and falls back to
|
||||||
walking the generic codec's `hw_configs` for the DRM device type;
|
walking the generic codec's `hw_configs` for either device type;
|
||||||
* creates an `AV_HWDEVICE_TYPE_DRM` hwdevice context bound to
|
* creates an hwdevice context bound to `/dev/dri/renderD128`. Uses
|
||||||
`/dev/dri/renderD128` via the new `av_hwdevice_ctx_create` wrapper
|
integer 13 (V4L2REQUEST as defined by Kwiboo's v4l2-request-n7.1.3
|
||||||
(patch 2/4) and attaches it to the codec context;
|
tree, what our libavcodec61-fourier emits) cast to enum
|
||||||
|
AVHWDeviceType for the av_hwdevice_ctx_create call;
|
||||||
* reuses the existing `ChooseV4L2PixelFormat` get-format callback
|
* reuses the existing `ChooseV4L2PixelFormat` get-format callback
|
||||||
(already returns `AV_PIX_FMT_DRM_PRIME`) and the existing
|
(already returns `AV_PIX_FMT_DRM_PRIME`) and the existing
|
||||||
`apply_cropping = 0` constraint.
|
`apply_cropping = 0` constraint.
|
||||||
|
|
||||||
`InitV4L2RequestDecoder` is invoked **before** `InitV4L2Decoder` in
|
`InitV4L2RequestDecoder` is invoked **before** `InitV4L2Decoder` in
|
||||||
`InitHWDecoderIfAllowed`. On Rockchip mainline it succeeds via either
|
`InitHWDecoderIfAllowed`. On Rockchip mainline it succeeds via either
|
||||||
mechanism (ALARM uses the named codec). On Pi4 / Mediatek /
|
mechanism. On Pi4 / Mediatek / vendor-MPP-stateful boards neither
|
||||||
vendor-MPP-stateful boards neither mechanism is registered for the
|
mechanism is registered for the codec, the function bails out, and the
|
||||||
codec, the function bails out, and the existing stateful
|
existing stateful `InitV4L2Decoder` runs as before. No regression of
|
||||||
`InitV4L2Decoder` runs as before. No regression of stateful boards.
|
stateful boards.
|
||||||
|
|
||||||
`mDRMDeviceContext` is unconditionally `av_buffer_unref`'d in
|
`mDRMDeviceContext` is unconditionally `av_buffer_unref`'d in
|
||||||
`ProcessShutdown` (no-op when null). Gated behind
|
`ProcessShutdown` (no-op when null). Gated behind
|
||||||
@@ -46,9 +49,8 @@ codec, the function bails out, and the existing stateful
|
|||||||
|
|
||||||
Bug 1969297.
|
Bug 1969297.
|
||||||
|
|
||||||
diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h
|
--- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h 2026-05-21 04:57:59.570946601 +0000
|
||||||
--- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h 2026-03-18 19:22:14.000000000 +0000
|
+++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h 2026-05-21 04:57:59.876488776 +0000
|
||||||
+++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h 2026-04-27 20:43:39.347992674 +0000
|
|
||||||
@@ -225,7 +225,12 @@
|
@@ -225,7 +225,12 @@
|
||||||
bool IsLinuxHDR() const;
|
bool IsLinuxHDR() const;
|
||||||
MediaResult InitVAAPIDecoder();
|
MediaResult InitVAAPIDecoder();
|
||||||
@@ -73,9 +75,8 @@ diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h b/dom/media/platfor
|
|||||||
// If video overlay is used we want to upload SW decoded frames to
|
// If video overlay is used we want to upload SW decoded frames to
|
||||||
// DMABuf and present it as a external texture to rendering pipeline.
|
// DMABuf and present it as a external texture to rendering pipeline.
|
||||||
bool mUploadSWDecodeToDMABuf = false;
|
bool mUploadSWDecodeToDMABuf = false;
|
||||||
diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
|
--- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp 2026-05-21 04:57:59.566685221 +0000
|
||||||
--- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp 2026-04-27 16:09:10.000000000 +0200
|
+++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp 2026-05-21 04:58:00.136004159 +0000
|
||||||
+++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp 2026-04-29 00:10:00.098884335 +0200
|
|
||||||
@@ -403,6 +403,129 @@
|
@@ -403,6 +403,129 @@
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
@@ -90,7 +91,7 @@ diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platf
|
|||||||
+ }
|
+ }
|
||||||
+ const char* drmDevice = "/dev/dri/renderD128";
|
+ const char* drmDevice = "/dev/dri/renderD128";
|
||||||
+ if (mLib->av_hwdevice_ctx_create(&mDRMDeviceContext,
|
+ if (mLib->av_hwdevice_ctx_create(&mDRMDeviceContext,
|
||||||
+ AV_HWDEVICE_TYPE_DRM, drmDevice,
|
+ (enum AVHWDeviceType)13, drmDevice,
|
||||||
+ nullptr, 0) < 0) {
|
+ nullptr, 0) < 0) {
|
||||||
+ FFMPEG_LOG(" av_hwdevice_ctx_create(DRM, %s) failed", drmDevice);
|
+ FFMPEG_LOG(" av_hwdevice_ctx_create(DRM, %s) failed", drmDevice);
|
||||||
+ return false;
|
+ return false;
|
||||||
@@ -143,7 +144,7 @@ diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platf
|
|||||||
+ for (int i = 0;; i++) {
|
+ for (int i = 0;; i++) {
|
||||||
+ const AVCodecHWConfig* cfg = mLib->avcodec_get_hw_config(generic, i);
|
+ const AVCodecHWConfig* cfg = mLib->avcodec_get_hw_config(generic, i);
|
||||||
+ if (!cfg) break;
|
+ if (!cfg) break;
|
||||||
+ if (cfg->device_type == AV_HWDEVICE_TYPE_DRM) {
|
+ if (cfg->device_type == AV_HWDEVICE_TYPE_DRM || (int)cfg->device_type == 13 || (int)cfg->device_type == 14) {
|
||||||
+ codec = generic;
|
+ codec = generic;
|
||||||
+ FFMPEG_LOG(" using generic codec %s with DRM hwaccel", codec->name);
|
+ FFMPEG_LOG(" using generic codec %s with DRM hwaccel", codec->name);
|
||||||
+ break;
|
+ break;
|
||||||
|
|||||||
@@ -24,31 +24,29 @@ pkgname=libva-v4l2-request-fourier
|
|||||||
epoch=1
|
epoch=1
|
||||||
_upstreampkg=libva-v4l2-request
|
_upstreampkg=libva-v4l2-request
|
||||||
|
|
||||||
# Pin the fork tip. de27e95 = "v4l2: log error_idx + failing ctrl id
|
# Pin the fork tip. c454618 = PR #16 merge "picture, request_pool:
|
||||||
# on S_EXT_CTRLS failure" — Phase 8.13 diagnostic that surfaced the
|
# transparent OUTPUT-pool resize on bitstream overrun (#15)" —
|
||||||
# real root cause of the libva→daedalus_v4l2 request-completion
|
# follow-up root-cause fix to #13/#14. On a mid-stream bitstream-
|
||||||
# timeout (turned out the EINVAL libva was logging was a harmless
|
# budget overrun (typical cause: SPS-driven resolution upshift in an
|
||||||
# H264/HEVC probe; actual VP9 stateless control SET worked all along).
|
# adaptive-bitrate stream), codec_store_buffer now snapshots the in-
|
||||||
|
# flight surface's accumulated bytes, releases its OUTPUT pool slot,
|
||||||
|
# calls request_pool_resize (STREAMOFF → REQBUFS(0) → S_FMT with
|
||||||
|
# 2×sizeimage hint, capped at 1 GiB, page-aligned → CREATE_BUFS →
|
||||||
|
# mmap → media_request_alloc → STREAMON), re-acquires a slot, re-
|
||||||
|
# mirrors the surface's source_{data,size,request_fd}, restores the
|
||||||
|
# bytes, and continues. The frame survives instead of being dropped
|
||||||
|
# back to libavcodec for surface recreation. CAPTURE side untouched
|
||||||
|
# (per-queue V4L2 streaming independence).
|
||||||
#
|
#
|
||||||
# Prior pin (7ac934e) was iter38b — fresnel-fourier multi-device probe
|
# Prior pin (2860d75) = PR #14 merge — codec_store_buffer bounds-
|
||||||
# + MAX_PROFILES bounds-check fix. de27e95 added the daedalus_v4l2
|
# check floor (#13).
|
||||||
# probe slot (b5b3acf), the meson option gate (2146341), and the
|
_commit=c454618ae11addce2e17b560f4deeacbed067d98
|
||||||
# S_EXT_CTRLS diagnostic (de27e95 itself). c332d34 (LIBVA-1) added
|
|
||||||
# the per-codec dispatch: rpi-hevc-dec + daedalus_v4l2 both probe each
|
|
||||||
# other as alts, VP9/AV1/H.264 route to daedalus via new 'd' kind,
|
|
||||||
# HEVC stays on 'p' (rpi-hevc-dec). 9898331 (LIBVA-2) completes that
|
|
||||||
# by adding video_fd_daedalus to any_fd_supports_output_format's probe
|
|
||||||
# array — without it, H.264/VP9/AV1 profiles never got advertised on
|
|
||||||
# Pi 5 mixed deployments (rpi-hevc-dec primary, daedalus alt) and
|
|
||||||
# ffmpeg bailed with "No support for codec h264 profile 578" before
|
|
||||||
# the per-codec dispatch could fire.
|
|
||||||
_commit=989833114a7708ad999dc68309cbc181d9913bdb
|
|
||||||
|
|
||||||
# Project version from meson.build (1.0.0) + commit count + short sha,
|
# Project version from meson.build (1.0.0) + commit count + short sha,
|
||||||
# matching the ffmpeg-v4l2-request-fourier convention. Recomputed at
|
# matching the ffmpeg-v4l2-request-fourier convention. Recomputed at
|
||||||
# build time by pkgver() below; the static value here is a placeholder
|
# build time by pkgver() below; the static value here is a placeholder
|
||||||
# so AUR-style consumers see something coherent before src/ exists.
|
# so AUR-style consumers see something coherent before src/ exists.
|
||||||
pkgver=1.0.0.r380.9898331
|
pkgver=1.0.0.r390.c454618
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="VA-API backend for V4L2 stateless decoders (multiplanar fork — fourier umbrella)"
|
pkgdesc="VA-API backend for V4L2 stateless decoders (multiplanar fork — fourier umbrella)"
|
||||||
arch=('aarch64')
|
arch=('aarch64')
|
||||||
|
|||||||
+49
-23
@@ -14,9 +14,9 @@
|
|||||||
# Sibling userspace package: ../daedalus-v4l2/build-deb.sh
|
# Sibling userspace package: ../daedalus-v4l2/build-deb.sh
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
UPSTREAM_COMMIT=3dd0eb070a75893f78368ce819b9e9ebf08c124d
|
UPSTREAM_COMMIT=79256dc7ef41f83873ca9c23db20f5888858e65d
|
||||||
PKGVER=0.1.0+r20+g3dd0eb0
|
PKGVER=0.1.0+r28+g79256dc
|
||||||
PKGREL=1 # reset for new upstream pin (3dd0eb0 — DAEMON-PPS H.264 SPS/PPS NAL synth)
|
PKGREL=1 # reset for new upstream pin (79256dc — H.264 B-frame reorder fix); still carries the #64 multi-kernel postinst fix
|
||||||
MODULE_NAME=daedalus_v4l2
|
MODULE_NAME=daedalus_v4l2
|
||||||
|
|
||||||
HERE=$(dirname "$(readlink -f "$0")")
|
HERE=$(dirname "$(readlink -f "$0")")
|
||||||
@@ -78,7 +78,6 @@ set -e
|
|||||||
|
|
||||||
NAME=${MODULE_NAME}
|
NAME=${MODULE_NAME}
|
||||||
VERSION=${PKGVER}
|
VERSION=${PKGVER}
|
||||||
KERNELVER=\$(uname -r)
|
|
||||||
|
|
||||||
# Yellow + bold ANSI for the warning so it stands out in apt's
|
# Yellow + bold ANSI for the warning so it stands out in apt's
|
||||||
# stream of "Setting up" lines. Disable colour on non-TTY.
|
# stream of "Setting up" lines. Disable colour on non-TTY.
|
||||||
@@ -101,29 +100,56 @@ if [ "\$1" = "configure" ]; then
|
|||||||
|
|
||||||
dkms add "\$NAME/\$VERSION" 2>/dev/null || true
|
dkms add "\$NAME/\$VERSION" 2>/dev/null || true
|
||||||
|
|
||||||
# Don't let autoinstall failure mask the actual problem behind '|| true'.
|
# Enumerate every kernel whose headers are actually present
|
||||||
# Run it, capture the result, then verify post-condition.
|
# (/lib/modules/<kver>/build resolves to a directory). We iterate
|
||||||
autoinstall_rc=0
|
# all of them — not just \$(uname -r) — so that installing this
|
||||||
dkms autoinstall "\$NAME/\$VERSION" || autoinstall_rc=\$?
|
# package after a kernel update covers the newly-installed kernel
|
||||||
|
# too, and so that a later kernel-headers install for a previously
|
||||||
|
# uncovered version gets picked up on dpkg-reconfigure. Without
|
||||||
|
# this, autoinstall (which targets only the running kernel) leaves
|
||||||
|
# /dev/daedalus-v4l2 absent after a kernel switch + reboot
|
||||||
|
# (marfrit/marfrit-packages#64).
|
||||||
|
kvers=''
|
||||||
|
for d in /lib/modules/*/build; do
|
||||||
|
[ -d "\$d" ] || continue
|
||||||
|
k=\$(basename "\$(dirname "\$d")")
|
||||||
|
kvers="\$kvers \$k"
|
||||||
|
done
|
||||||
|
|
||||||
# Verify the module actually built + installed for the running kernel.
|
if [ -z "\$kvers" ]; then
|
||||||
status=\$(dkms status -m "\$NAME" -v "\$VERSION" -k "\$KERNELVER" 2>/dev/null || true)
|
|
||||||
if ! printf '%s\\n' "\$status" | grep -q -E 'installed|loaded'; then
|
|
||||||
warn ""
|
warn ""
|
||||||
warn "DKMS build did NOT land for kernel \$KERNELVER."
|
warn "No kernels with headers found under /lib/modules/*/build."
|
||||||
warn " dkms status -m \$NAME -v \$VERSION -k \$KERNELVER:"
|
warn "Install kernel headers (e.g. linux-headers-rpi-2712 on Pi OS)"
|
||||||
warn " \$(printf '%s' "\$status" | head -1)"
|
warn "then finish with:"
|
||||||
warn ""
|
|
||||||
warn "Most likely cause: kernel headers package is missing."
|
|
||||||
warn " Raspberry Pi OS / Pi 5: apt install linux-headers-rpi-2712"
|
|
||||||
warn " Debian generic: apt install linux-headers-\$KERNELVER"
|
|
||||||
warn ""
|
|
||||||
warn "After installing headers, finish the install with:"
|
|
||||||
warn " sudo dkms autoinstall \$NAME/\$VERSION"
|
warn " sudo dkms autoinstall \$NAME/\$VERSION"
|
||||||
warn " sudo modprobe daedalus_v4l2"
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
failed=''
|
||||||
|
for k in \$kvers; do
|
||||||
|
dkms autoinstall -k "\$k" "\$NAME/\$VERSION" >/dev/null 2>&1 || true
|
||||||
|
s=\$(dkms status -m "\$NAME" -v "\$VERSION" -k "\$k" 2>/dev/null || true)
|
||||||
|
if ! printf '%s\\n' "\$s" | grep -q -E 'installed|loaded'; then
|
||||||
|
failed="\$failed \$k"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ -n "\$failed" ]; then
|
||||||
warn ""
|
warn ""
|
||||||
warn "Until then daedalus_v4l2 will NOT be loadable and the"
|
warn "DKMS build did NOT land for kernel(s):\$failed"
|
||||||
warn "userspace daedalus-v4l2 daemon will have nothing to talk to."
|
warn ""
|
||||||
|
warn "Most likely cause: kernel headers missing for those versions."
|
||||||
|
warn " Raspberry Pi OS / Pi 5: apt install linux-headers-rpi-2712"
|
||||||
|
warn " Debian generic: apt install linux-headers-<version>"
|
||||||
|
warn ""
|
||||||
|
warn "After installing headers, finish with:"
|
||||||
|
for k in \$failed; do
|
||||||
|
warn " sudo dkms autoinstall -k \$k \$NAME/\$VERSION"
|
||||||
|
done
|
||||||
|
warn " sudo modprobe daedalus_v4l2 (after booting that kernel)"
|
||||||
|
warn ""
|
||||||
|
warn "Until then daedalus_v4l2 will NOT be loadable on those kernels"
|
||||||
|
warn "and the userspace daedalus-v4l2 daemon will have nothing to talk to."
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
+60
@@ -1,3 +1,63 @@
|
|||||||
|
daedalus-v4l2-dkms (0.1.0+r28+g79256dc-1) bookworm trixie; urgency=medium
|
||||||
|
|
||||||
|
* Bump to 79256dc — H.264 B-frame display reorder fix (closes
|
||||||
|
daedalus-v4l2#6). libavcodec's H.264 decoder reorders output to
|
||||||
|
display order before returning from avcodec_receive_frame; the
|
||||||
|
daemon was binding each REQ_DECODE's pixels to the cookie of the
|
||||||
|
bitstream that triggered the receive_frame call, not the cookie
|
||||||
|
of the bitstream that actually produced the picture. For B-frame
|
||||||
|
sequences this paired cookie N's CAPTURE buffer with cookie N-2's
|
||||||
|
pixels and silently lost intermediate frames — visible as
|
||||||
|
"2 1 4 3 6 5" frame pairing in mpv / Firefox on Pi CM5.
|
||||||
|
* Wire-protocol bump (DAEDALUS_PROTO_VERSION 0 → 1): REQ_DECODE
|
||||||
|
gains __u64 src_pts; RESP_FRAME gains __u32 flags +
|
||||||
|
__u64 output_src_pts. Kernel + daemon must install atomically
|
||||||
|
(this package + daedalus-v4l2 0.1.0+r28+g79256dc).
|
||||||
|
* Carries forward the #64 multi-kernel postinst fix from -2:
|
||||||
|
autoinstall for every /lib/modules/*/build that resolves to real
|
||||||
|
headers, not just $(uname -r).
|
||||||
|
* Closes #64.
|
||||||
|
|
||||||
|
-- Markus Fritsche <mfritsche@reauktion.de> Thu, 21 May 2026 12:00:00 +0000
|
||||||
|
|
||||||
|
daedalus-v4l2-dkms (0.1.0+r24+gf0d4186-2) bookworm trixie; urgency=medium
|
||||||
|
|
||||||
|
* postinst: autoinstall for every installed kernel with headers, not
|
||||||
|
just the running one. Previously `dkms autoinstall $NAME/$VERSION`
|
||||||
|
built only against `$(uname -r)`, so installing the package on
|
||||||
|
kernel A and then rebooting into a separately-installed kernel B
|
||||||
|
left /lib/modules/B/updates/dkms/ empty — /dev/daedalus-v4l2 absent,
|
||||||
|
daedalus daemon nothing to talk to, browser/VAAPI silently falling
|
||||||
|
back to software with no obvious diagnostic. Now we enumerate every
|
||||||
|
/lib/modules/*/build that resolves to a real directory and run
|
||||||
|
`dkms autoinstall -k <kver>` for each, reporting per-kernel failure
|
||||||
|
only when headers are missing. Closes #64.
|
||||||
|
|
||||||
|
-- Markus Fritsche <mfritsche@reauktion.de> Thu, 21 May 2026 09:30:00 +0000
|
||||||
|
|
||||||
|
daedalus-v4l2-dkms (0.1.0+r24+gf0d4186-1) bookworm trixie; urgency=medium
|
||||||
|
|
||||||
|
* Bump to f0d4186 — per-ctx vb2 lock fix. daedalus_queue_init now
|
||||||
|
uses ctx->vb_mutex instead of ctx->dev->m2m_lock for each
|
||||||
|
vb2_queue's lock, unblocking Firefox's multi-process VAAPI
|
||||||
|
clients (they were colliding on the device-wide mutex and one
|
||||||
|
would EBUSY-fail S_FMT while another was mid-streamon).
|
||||||
|
|
||||||
|
-- Markus Fritsche <mfritsche@reauktion.de> Wed, 20 May 2026 23:00:00 +0000
|
||||||
|
|
||||||
|
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
|
daedalus-v4l2-dkms (0.1.0+r20+g3dd0eb0-1) bookworm trixie; urgency=medium
|
||||||
|
|
||||||
* Bump to 3dd0eb0 — DAEMON-PPS kernel-side changes. device_run()
|
* Bump to 3dd0eb0 — DAEMON-PPS kernel-side changes. device_run()
|
||||||
|
|||||||
Vendored
+10
-7
@@ -11,13 +11,16 @@
|
|||||||
# Upstream repo: https://git.reauktion.de/reauktion/daedalus-v4l2
|
# Upstream repo: https://git.reauktion.de/reauktion/daedalus-v4l2
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
# Same pin as the Arch PKGBUILD. 481279c = "Phase 8.13: byte-exact
|
# Same pin as the Arch PKGBUILD. 79256dc = "kernel + daemon: H.264
|
||||||
# end-to-end via libva (consumer target hit)" — first commit where the
|
# B-frame display reorder fix (closes #6)" — adds the wire-protocol
|
||||||
# full ffmpeg -hwaccel vaapi → libva → /dev/video0 → daemon path lands
|
# src_pts / output_src_pts / RESP_FRAME flags split that lets H.264
|
||||||
# a pixel-correct decoded frame back in ffmpeg.
|
# streams with B-frames preserve display order through libva → kernel
|
||||||
UPSTREAM_COMMIT=3dd0eb070a75893f78368ce819b9e9ebf08c124d
|
# → daemon. PROTO_VERSION bumps 0 → 1; lock-step userspace + kernel
|
||||||
PKGVER=0.1.0+r20+g3dd0eb0
|
# rebuild REQUIRED (daedalus-v4l2-dkms build-deb.sh pinned to the same
|
||||||
PKGREL=1 # reset for new upstream pin (3dd0eb0 — DAEMON-PPS H.264 SPS/PPS NAL synth)
|
# commit).
|
||||||
|
UPSTREAM_COMMIT=79256dc7ef41f83873ca9c23db20f5888858e65d
|
||||||
|
PKGVER=0.1.0+r28+g79256dc
|
||||||
|
PKGREL=1 # reset for new upstream pin (79256dc — H.264 B-frame reorder fix)
|
||||||
|
|
||||||
HERE=$(dirname "$(readlink -f "$0")")
|
HERE=$(dirname "$(readlink -f "$0")")
|
||||||
|
|
||||||
|
|||||||
+59
@@ -1,3 +1,62 @@
|
|||||||
|
daedalus-v4l2 (0.1.0+r28+g79256dc-1) bookworm trixie; urgency=medium
|
||||||
|
|
||||||
|
* Bump to 79256dc — H.264 B-frame display reorder fix (closes
|
||||||
|
daedalus-v4l2#6 + #4 menu controls). Daemon side: the
|
||||||
|
avcodec_send_packet → receive_frame loop now stamps pkt->pts =
|
||||||
|
req->src_pts so libavcodec's display-ordered frame->pts identifies
|
||||||
|
which OUTPUT bitstream's pixels each drained frame belongs to.
|
||||||
|
chardev_client maintains a (src_pts → cookie) lookup table so the
|
||||||
|
daemon can ship pixels to the cookie of the *originating*
|
||||||
|
bitstream, not the cookie of whatever REQ triggered the
|
||||||
|
receive_frame call. Multiple RESP_FRAME messages per REQ_DECODE
|
||||||
|
are now possible (one for the just-consumed src, one or more for
|
||||||
|
drained pixels).
|
||||||
|
* Wire-protocol bump (DAEDALUS_PROTO_VERSION 0 → 1): REQ_DECODE
|
||||||
|
gains __u64 src_pts; RESP_FRAME gains __u32 flags +
|
||||||
|
__u64 output_src_pts. Daemon + kernel must install atomically
|
||||||
|
(this package + daedalus-v4l2-dkms 0.1.0+r28+g79256dc).
|
||||||
|
* Also subsumes 79256dc's predecessor 7ff2d89 — H.264 DECODE_MODE +
|
||||||
|
START_CODE menu-control registration that retires the
|
||||||
|
"Unable to set control(s) error_idx=2/2" warning libva-v4l2-
|
||||||
|
request emitted on every context init.
|
||||||
|
|
||||||
|
-- Markus Fritsche <mfritsche@reauktion.de> Thu, 21 May 2026 12:00:00 +0000
|
||||||
|
|
||||||
|
daedalus-v4l2 (0.1.0+r24+gf0d4186-1) bookworm trixie; urgency=medium
|
||||||
|
|
||||||
|
* Bump to f0d4186 — kernel per-ctx vb2 lock fix. daedalus_queue_init
|
||||||
|
was wiring src_vq->lock and dst_vq->lock to ctx->dev->m2m_lock (a
|
||||||
|
device-wide mutex), serialising every vb2 ioctl across all
|
||||||
|
concurrent clients of /dev/video0. For Firefox (which spawns
|
||||||
|
separate content + RDD + GPU processes that each open the device
|
||||||
|
and run libva probe simultaneously), one libva session's
|
||||||
|
S_FMT(OUTPUT_MPLANE) hit EBUSY while another was mid-streamon —
|
||||||
|
Firefox VAAPI playback fell apart at startup.
|
||||||
|
* Fix gives each open() its own ctx->vb_mutex; vb2 ioctls run
|
||||||
|
independently per client. Matches cedrus / rkvdec / hantro
|
||||||
|
pattern.
|
||||||
|
* Verified on higgs: Firefox YouTube playback engages VAAPI cleanly,
|
||||||
|
sustained ~230 fps decode at 640x368 through the daedalus daemon,
|
||||||
|
zero EBUSY in stderr or daemon journal.
|
||||||
|
|
||||||
|
-- Markus Fritsche <mfritsche@reauktion.de> Wed, 20 May 2026 23:00:00 +0000
|
||||||
|
|
||||||
|
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
|
daedalus-v4l2 (0.1.0+r20+g3dd0eb0-1) bookworm trixie; urgency=medium
|
||||||
|
|
||||||
* Bump to 3dd0eb0 — DAEMON-PPS H.264 SPS/PPS NAL synthesiser.
|
* Bump to 3dd0eb0 — DAEMON-PPS H.264 SPS/PPS NAL synthesiser.
|
||||||
|
|||||||
+19
-9
@@ -10,15 +10,25 @@
|
|||||||
# Upstream fork: https://git.reauktion.de/marfrit/libva-v4l2-request-fourier
|
# Upstream fork: https://git.reauktion.de/marfrit/libva-v4l2-request-fourier
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
# Same pin as the Arch PKGBUILD. 9898331 = LIBVA-2 close — completes
|
# Same pin as the Arch PKGBUILD. c454618 = PR #16 merge "picture,
|
||||||
# the per-codec dispatch from c332d34 (LIBVA-1) by adding video_fd_
|
# request_pool: transparent OUTPUT-pool resize on bitstream overrun
|
||||||
# daedalus to any_fd_supports_output_format's probe array. Without
|
# (#15)" — follow-up root-cause fix to #13/#14. On a mid-stream
|
||||||
# it, H.264/VP9/AV1 profiles never got advertised on Pi 5 mixed
|
# bitstream-budget overrun (typical cause: SPS-driven resolution
|
||||||
# deployments (rpi-hevc-dec primary, daedalus_v4l2 alt) — ffmpeg
|
# upshift in an adaptive-bitrate stream), codec_store_buffer now
|
||||||
# bailed with "No support for codec h264 profile 578" before the
|
# snapshots the in-flight surface's accumulated bytes, releases its
|
||||||
# per-codec dispatch could even fire.
|
# OUTPUT pool slot, calls request_pool_resize (STREAMOFF →
|
||||||
UPSTREAM_COMMIT=989833114a7708ad999dc68309cbc181d9913bdb
|
# REQBUFS(0) → S_FMT with 2×sizeimage hint, capped at 1 GiB, page-
|
||||||
PKGVER=1.0.0+r380+g9898331
|
# aligned → CREATE_BUFS → mmap → media_request_alloc → STREAMON),
|
||||||
|
# re-acquires a slot, re-mirrors the surface's source_{data,size,
|
||||||
|
# request_fd}, restores the bytes, and continues. The frame
|
||||||
|
# survives instead of being dropped back to libavcodec for surface
|
||||||
|
# recreation. CAPTURE side untouched (per-queue V4L2 streaming
|
||||||
|
# independence).
|
||||||
|
#
|
||||||
|
# Prior pin (2860d75) = PR #14 merge — codec_store_buffer bounds-
|
||||||
|
# check floor (#13).
|
||||||
|
UPSTREAM_COMMIT=c454618ae11addce2e17b560f4deeacbed067d98
|
||||||
|
PKGVER=1.0.0+r390+gc454618
|
||||||
PKGREL=1
|
PKGREL=1
|
||||||
|
|
||||||
HERE=$(dirname "$(readlink -f "$0")")
|
HERE=$(dirname "$(readlink -f "$0")")
|
||||||
|
|||||||
Reference in New Issue
Block a user