forked from marfrit/marfrit-packages
libva-v4l2-request-fourier: bump pin to 2860d75 (#13 bounds-check fix)
Bumps both the Arch PKGBUILD and the Debian build-deb.sh pins to PR #14 merge — codec_store_buffer bounds-checks for VASliceDataBufferType. Picks up the SIGSEGV fix for mpv --hwdec=vaapi-copy on resolution upshift mid-stream (issue #13). Dual-pin so check-already-published.sh detects both pool ABIs as needing a fresh build.
This commit is contained in:
@@ -24,29 +24,28 @@ pkgname=libva-v4l2-request-fourier
|
|||||||
epoch=1
|
epoch=1
|
||||||
_upstreampkg=libva-v4l2-request
|
_upstreampkg=libva-v4l2-request
|
||||||
|
|
||||||
# Pin the fork tip. 77f9236 = PR #12 merge "av1: populate
|
# Pin the fork tip. 2860d75 = PR #14 merge "picture: bounds-check
|
||||||
# V4L2_CID_STATELESS_AV1_SEQUENCE in codec_set_controls (#11 libva side)"
|
# codec_store_buffer slice writes against source_size (#13)" — addresses
|
||||||
# — addresses the libva-side portion of marfrit/libva-v4l2-request-fourier#11.
|
# marfrit/libva-v4l2-request-fourier#13. Guards the three append sites
|
||||||
# Adds src/av1.{c,h} with av1_set_controls that maps VAAPI's
|
# in codec_store_buffer's VASliceDataBufferType branch (H.264 Annex-B
|
||||||
# VAPictureParameterBufferAV1.seq_info_fields onto struct
|
# start code, VP8 uncompressed-header pad, slice payload) against the
|
||||||
# v4l2_ctrl_av1_sequence and queues V4L2_CID_STATELESS_AV1_SEQUENCE via
|
# OUTPUT pool slot's fixed sizeimage; returns
|
||||||
# S_EXT_CTRLS. The daedalus_v4l2 daemon track is the consumer that turns
|
# VA_STATUS_ERROR_ALLOCATION_FAILED with a request_log line instead of
|
||||||
# the ctrl into an OBU_SEQUENCE_HEADER and prepends it to the slice
|
# memcpy'ing past the mmap on a resolution upshift mid-stream (SIGSEGV
|
||||||
# bitstream so libdav1d can parse the (sequence-header-stripped) OUTPUT
|
# in mpv --hwdec=vaapi-copy, heap-corruption hazard in Firefox RDD).
|
||||||
# buffer that ffmpeg-vaapi delivers. Until the daemon side lands the ctrl
|
# The root-cause refactor (re-init OUTPUT pool / re-create surfaces on
|
||||||
# is just sitting in the request unused — no-cost no-op for HW decoders
|
# resolution change, or grow source_data on demand) is tracked as the
|
||||||
# (vpu981 parses OBU bytes directly).
|
# follow-up backlog item; this PR is the memory-safety floor.
|
||||||
#
|
#
|
||||||
# Prior pin (c1bb444) = PR #9 merge — h264_set_controls
|
# Prior pin (77f9236) = PR #12 merge — av1_set_controls
|
||||||
# max_num_ref_frames fallback + libva-boundary instrumentation for the
|
# (V4L2_CID_STATELESS_AV1_SEQUENCE for the daedalus daemon track).
|
||||||
# daedalus consumer-strict path (issue #8 libva side).
|
_commit=2860d75afe6a8e34df6afb508ff85c822bf9e908
|
||||||
_commit=77f92364661419f6e5a7bd827c1b845b4e426569
|
|
||||||
|
|
||||||
# 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.r386.77f9236
|
pkgver=1.0.0.r388.2860d75
|
||||||
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')
|
||||||
|
|||||||
+16
-15
@@ -10,22 +10,23 @@
|
|||||||
# 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. 77f9236 = PR #12 merge "av1:
|
# Same pin as the Arch PKGBUILD. 2860d75 = PR #14 merge "picture:
|
||||||
# populate V4L2_CID_STATELESS_AV1_SEQUENCE in codec_set_controls
|
# bounds-check codec_store_buffer slice writes against source_size
|
||||||
# (#11 libva side)" — adds src/av1.{c,h} with av1_set_controls that
|
# (#13)" — guards the three append sites in codec_store_buffer's
|
||||||
# maps VAAPI's VAPictureParameterBufferAV1.seq_info_fields onto
|
# VASliceDataBufferType branch (H.264 Annex-B start code, VP8
|
||||||
# struct v4l2_ctrl_av1_sequence and queues V4L2_CID_STATELESS_AV1_
|
# uncompressed-header pad, slice payload) against the OUTPUT pool
|
||||||
# SEQUENCE via S_EXT_CTRLS. The daedalus_v4l2 daemon track is the
|
# slot's fixed sizeimage; returns VA_STATUS_ERROR_ALLOCATION_FAILED
|
||||||
# consumer that turns the ctrl into an OBU_SEQUENCE_HEADER and
|
# with a request_log line instead of memcpy'ing past the mmap on a
|
||||||
# prepends it to the slice bitstream so libdav1d can parse the
|
# resolution upshift mid-stream. Fixes a SIGSEGV in mpv
|
||||||
# (sequence-header-stripped) OUTPUT buffer that ffmpeg-vaapi
|
# --hwdec=vaapi-copy and a heap-corruption hazard in Firefox RDD.
|
||||||
# delivers.
|
# The root-cause refactor (re-init OUTPUT pool / re-create surfaces
|
||||||
|
# on resolution change, or grow source_data on demand) is tracked
|
||||||
|
# as the follow-up backlog item; this is the memory-safety floor.
|
||||||
#
|
#
|
||||||
# Prior pin (c1bb444) = PR #9 merge — h264_set_controls
|
# Prior pin (77f9236) = PR #12 merge — av1_set_controls
|
||||||
# max_num_ref_frames fallback + libva-boundary instrumentation for
|
# (V4L2_CID_STATELESS_AV1_SEQUENCE for the daedalus daemon track).
|
||||||
# the daedalus consumer-strict path (issue #8 libva side).
|
UPSTREAM_COMMIT=2860d75afe6a8e34df6afb508ff85c822bf9e908
|
||||||
UPSTREAM_COMMIT=77f92364661419f6e5a7bd827c1b845b4e426569
|
PKGVER=1.0.0+r388+g2860d75
|
||||||
PKGVER=1.0.0+r386+g77f9236
|
|
||||||
PKGREL=1
|
PKGREL=1
|
||||||
|
|
||||||
HERE=$(dirname "$(readlink -f "$0")")
|
HERE=$(dirname "$(readlink -f "$0")")
|
||||||
|
|||||||
Reference in New Issue
Block a user