forked from marfrit/libva-v4l2-request-fourier
1a2c958ab3
Per Phase 4 plan + Phase 5 review amendments (SPS parse-and-cache,
per-fd gating).
src/h265.c additions:
- #include <errno.h>, the v4l2-hevc-ext-controls.h, and the
vendored gst/codecparsers/gsth265parser.h
- new static helper h265_populate_ext_sps_rps_cache(): walks
surface_object->source_data for an SPS NAL (nal_unit_type == 33)
using gst_h265_parser_identify_nalu; if found, calls
gst_h265_parser_parse_sps_ext (NOT gst_h265_parser_parse_sps —
the latter discards the per-RPS-entry EXT data we need); maps
GstH265ShortTermRefPicSet (base) + GstH265ShortTermRefPicSetExt
(carrying use_delta_flag[16], used_by_curr_pic_flag[16],
delta_poc_s0_minus1[16], delta_poc_s1_minus1[16]) into the V4L2
struct arrays; stores on driver_data->hevc_rps_cache_*
- non-IDR-frame handling: cache holds across frames, so frames
whose source_data lacks an SPS NAL reuse the previously-parsed
cached arrays (Phase 5 review item #3)
- controls[] grows from [5] to [7]; the 2 new entries are appended
after the standard 5 (SPS/PPS/SLICE_PARAMS/SCALING_MATRIX/
DECODE_PARAMS), gated by driver_data->has_hevc_ext_sps_rps_rkvdec
(per-fd probe result from Step 3) + the cache being valid
- field-by-field mapping mirrors GStreamer's
gst_v4l2_codec_h265_dec_fill_ext_sps_rps verbatim (the upstream
reference identified in Phase 0 prior-art survey)
src/request.h additions:
- struct request_data carries hevc_rps_cache_st (array pointer),
_st_count, hevc_rps_cache_lt, _lt_count, hevc_rps_cache_valid.
Single-slot cache (sps_id 0 only; multi-SPS streams would need
expanding). Stores POST-MAPPED V4L2 structs so request.h doesn't
need to know GstH265SPS / GstH265SPSEXT types.
Critical interpretation correction (Phase 5 review followup):
GstH265SPS has short_term_ref_pic_set[65] (base) but NOT
short_term_ref_pic_set_ext[]. The EXT array lives on a SEPARATE
GstH265SPSEXT struct accessed via gst_h265_parser_parse_sps_ext.
The 'plain' gst_h265_parser_parse_sps internally calls _ext with a
LOCAL discarded SPSEXT (see gsth265parser.c:2050). Our call must
use the _ext variant directly to keep the EXT data. Caught during
Step 4 first-build error.
Build verified: ninja -C build clean. .so is 759 KB (up from 485 KB
original, 682 KB after Step 2 vendor — the +80 KB is the new helper
+ extension).
iter2 Phase 6 Step 5 (install + reboot + smoke-test) is the F1
falsifier moment: if HEVC stops OOPSing, mechanism confirmed; if it
still OOPSes, loopback Phase 0 with re-opened kernel-agent#11.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
195 lines
7.7 KiB
C
195 lines
7.7 KiB
C
/*
|
|
* Copyright (C) 2007 Intel Corporation
|
|
* Copyright (C) 2016 Florent Revest <florent.revest@free-electrons.com>
|
|
* Copyright (C) 2018 Paul Kocialkowski <paul.kocialkowski@bootlin.com>
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the
|
|
* "Software"), to deal in the Software without restriction, including
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
* distribute, sub license, and/or sell copies of the Software, and to
|
|
* permit persons to whom the Software is furnished to do so, subject to
|
|
* the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the
|
|
* next paragraph) shall be included in all copies or substantial portions
|
|
* of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
|
|
* IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
|
|
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
#ifndef _V4L2_REQUEST_H_
|
|
#define _V4L2_REQUEST_H_
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include "context.h"
|
|
#include "object_heap.h"
|
|
#include "request_pool.h"
|
|
#include "cap_pool.h"
|
|
#include "video.h"
|
|
#include <va/va.h>
|
|
|
|
#include <linux/videodev2.h>
|
|
|
|
#include "hevc-ctrls/v4l2-hevc-ext-controls.h"
|
|
|
|
#define V4L2_REQUEST_STR_VENDOR "v4l2-request"
|
|
|
|
#define V4L2_REQUEST_MAX_PROFILES 11
|
|
#define V4L2_REQUEST_MAX_ENTRYPOINTS 5
|
|
#define V4L2_REQUEST_MAX_CONFIG_ATTRIBUTES 10
|
|
#define V4L2_REQUEST_MAX_IMAGE_FORMATS 10
|
|
#define V4L2_REQUEST_MAX_SUBPIC_FORMATS 4
|
|
#define V4L2_REQUEST_MAX_DISPLAY_ATTRIBUTES 4
|
|
|
|
struct request_data {
|
|
struct object_heap config_heap;
|
|
struct object_heap context_heap;
|
|
struct object_heap surface_heap;
|
|
struct object_heap buffer_heap;
|
|
struct object_heap image_heap;
|
|
int video_fd;
|
|
int media_fd;
|
|
|
|
/*
|
|
* iter38: multi-device probe. RK3399 has two V4L2 stateless decoders:
|
|
* - rkvdec → H264 / HEVC / VP9
|
|
* - hantro-vpu (rk3399-vpu-dec) → MPEG-2 / VP8
|
|
* At VA_DRIVER_INIT we probe both, open their fds, and store them
|
|
* here. driver_data->video_fd / media_fd above are the "active" fds
|
|
* (point at one of the pairs below). RequestCreateConfig retargets
|
|
* them based on the profile's required device. Pools and video_format
|
|
* are torn down at retarget time so the next CreateContext rebuilds
|
|
* them against the right device.
|
|
*
|
|
* -1 means that device kind isn't present on this kernel boot.
|
|
* Honours LIBVA_V4L2_REQUEST_VIDEO_PATH / MEDIA_PATH explicit
|
|
* overrides — when those are set, only the single requested device
|
|
* is opened and the alt fds stay -1.
|
|
*/
|
|
int video_fd_rkvdec;
|
|
int media_fd_rkvdec;
|
|
int video_fd_hantro;
|
|
int media_fd_hantro;
|
|
|
|
/*
|
|
* iter2 (ampere-kernel-decoders campaign) — per-fd probe result
|
|
* for the V4L2_CID_STATELESS_HEVC_EXT_SPS_{ST,LT}_RPS controls
|
|
* introduced in Linux 7.0 (Casanova VDPU381/VDPU383 series).
|
|
* RK3399 rkvdec doesn't have them and the probe returns false;
|
|
* RK3588 rkvdec (VDPU381/383) registers them and the probe is
|
|
* true. h265_set_controls consults only the rkvdec entry because
|
|
* HEVC routes through rkvdec only — hantro's entry stays false
|
|
* naturally (it doesn't have rkvdec-specific controls).
|
|
*
|
|
* The pair-of-flags layout mirrors video_fd_rkvdec /
|
|
* video_fd_hantro above (iter38 multi-device-probe pattern,
|
|
* memory feedback_multi_device_probe_design). Phase 5 review
|
|
* surfaced this as a correctness item: a single scalar on
|
|
* driver_data would silently misbehave across device-switch
|
|
* boundaries; per-fd storage is the safe shape.
|
|
*/
|
|
bool has_hevc_ext_sps_rps_rkvdec;
|
|
bool has_hevc_ext_sps_rps_hantro;
|
|
|
|
/*
|
|
* iter2 — cached SPS-derived RPS arrays. SPS NALs only appear in
|
|
* source_data on IDR frames; non-IDR frames' h265_set_controls
|
|
* reuse the cached arrays so we don't submit zero-filled RPS to
|
|
* the kernel (which would re-trigger the OOPS the iter2 fix is
|
|
* designed to prevent). Single-slot cache (sps_id 0 only) —
|
|
* adequate for the BBB / typical-stream case; multi-SPS streams
|
|
* would need expanding to a [16] cache keyed by sps_id.
|
|
*
|
|
* The cache stores the post-mapped V4L2 control struct arrays
|
|
* (not the intermediate GstH265SPS) so request.h doesn't need
|
|
* to know about the vendored GStreamer parser types — only the
|
|
* V4L2 UAPI structs from hevc-ctrls/v4l2-hevc-ext-controls.h
|
|
* included above.
|
|
*
|
|
* Owned by h265.c; freed at RequestTerminate.
|
|
*/
|
|
struct v4l2_ctrl_hevc_ext_sps_st_rps *hevc_rps_cache_st;
|
|
unsigned int hevc_rps_cache_st_count;
|
|
struct v4l2_ctrl_hevc_ext_sps_lt_rps *hevc_rps_cache_lt;
|
|
unsigned int hevc_rps_cache_lt_count;
|
|
bool hevc_rps_cache_valid;
|
|
|
|
struct video_format *video_format;
|
|
|
|
/*
|
|
* OUTPUT (bitstream-input) buffer pool, decoupled from VA
|
|
* surfaces. Sized by codec pipeline depth, populated on first
|
|
* RequestCreateContext, torn down at driver Terminate.
|
|
*/
|
|
struct request_pool output_pool;
|
|
|
|
/*
|
|
* CAPTURE (decoded-frame) buffer pool, decoupled from VA
|
|
* surfaces (iter2 Fix 3). Each surface acquires a slot at
|
|
* vaBeginPicture time and releases it on the next acquisition
|
|
* or vaDestroySurfaces. Pool sized to max(surfaces_count,
|
|
* MIN_CAP_POOL) at first vaCreateSurfaces2; torn down at
|
|
* vaDestroyContext.
|
|
*
|
|
* Background: pre-iter2 each surface was 1:1 bound to one
|
|
* CAPTURE buffer index; mpv re-using a surface for a new decode
|
|
* caused V4L2 to re-QBUF the same physical buffer while a
|
|
* compositor still held an EXPBUF'd dma_buf fd, producing
|
|
* visible stutter on mpv vaapi --vo=gpu.
|
|
*/
|
|
struct cap_pool capture_pool;
|
|
|
|
/*
|
|
* iter5b-β: the pre-β last_output_{width,height} cache fields
|
|
* and surface_reset_format_cache() helper are deleted. They
|
|
* existed because CreateSurfaces2 owned the OUTPUT-side V4L2
|
|
* device-format lifecycle and needed to gate re-S_FMT on
|
|
* resolution change. β moves that lifecycle to CreateContext,
|
|
* which is naturally one-shot per context cycle; no caching is
|
|
* required. DestroyContext + next CreateContext rebuild from
|
|
* scratch.
|
|
*
|
|
* iter5b-β Commit D: cache the format-uniform CAPTURE-side
|
|
* geometry from v4l2_get_format so CreateSurfaces2 can populate
|
|
* a newly-created surface's destination_* fields without
|
|
* re-querying the device. Set by CreateContext after the
|
|
* v4l2_get_format(CAPTURE) call; consumed by both:
|
|
* 1. CreateContext's surface_heap walk (fills surfaces that
|
|
* pre-exist when CreateContext fires);
|
|
* 2. CreateSurfaces2's per-surface init (fills surfaces
|
|
* created AFTER CreateContext, e.g. ffmpeg vaapi-copy
|
|
* pool dynamics where the consumer passes surfaces_count=0
|
|
* to vaCreateContext and creates surfaces lazily).
|
|
*
|
|
* fmt_valid is true once CreateContext has populated the cache;
|
|
* CreateSurfaces2 only lazy-fills when fmt_valid is true.
|
|
*/
|
|
bool fmt_valid;
|
|
unsigned int fmt_format_height;
|
|
unsigned int fmt_planes_count;
|
|
unsigned int fmt_buffers_count;
|
|
unsigned int fmt_sizes[VIDEO_MAX_PLANES];
|
|
unsigned int fmt_bytesperlines[VIDEO_MAX_PLANES];
|
|
};
|
|
|
|
VAStatus VA_DRIVER_INIT_FUNC(VADriverContextP context);
|
|
VAStatus RequestTerminate(VADriverContextP context);
|
|
|
|
/*
|
|
* iter38: retarget driver_data->{video,media}_fd to the device required by
|
|
* `profile`. Returns 0 on success, -1 on profile not mappable to any kind.
|
|
* Defined in request.c.
|
|
*/
|
|
int request_switch_device_for_profile(struct request_data *driver_data,
|
|
VAProfile profile);
|
|
|
|
#endif
|