662f8874ba
Adds VAProfileH264High10 and VAProfileHEVCMain10 to the libva-v4l2-request
backend. RK3399 rkvdec emits decoded frames as V4L2_PIX_FMT_NV15 (4 × 10-bit
values packed in 5 bytes per element); VAAPI consumers receive standard
VA_FOURCC_P010 via a new userspace unpack in copy_surface_to_image.
VP9 Profile 2 explicitly NOT added — RK3399 rkvdec kernel ctrl table
caps at V4L2_MPEG_VIDEO_VP9_PROFILE_0 (rkvdec.c::rkvdec_vp9_ctrl_descs).
Touchpoints (per Phase 5 sonnet-architect review amendments):
- include/drm_fourcc.h: define DRM_FORMAT_NV15 (vendored libdrm lacks it)
- src/nv15.{c,h}: NV15 → P010 plane unpack (LSB-first, per
Documentation/userspace-api/media/v4l/pixfmt-nv15.rst)
- src/video.c: NV15 entry in formats[] (else NULL-deref on video_format_find)
- src/codec.c: pixelformat_for_profile cases for Hi10P + Main10
- src/config.c: enumeration, validation, entrypoints, RT_FORMAT_YUV420_10
advertisement for 10-bit profiles
- src/context.c: per-profile CAPTURE pix_fmt (NV12/NV15), 10-bit synthetic
SPS (bit_depth_luma_minus8=2), video_format invalidation on bit-depth
transition (sibling to iter38 device-switch invalidation), is_10bit flag
- src/surface.c: RT_FORMAT_YUV420_10 admission, NV15 fourcc on PRIME export
- src/image.c: P010 reporting in DeriveImage + QueryImageFormats,
P010-aware sizing in CreateImage, NV15 → P010 unpack call in
copy_surface_to_image (gated on is_10bit + image.format.fourcc == P010)
- src/picture.c: 4 switch blocks route Hi10P/Main10 to existing H264/HEVC
per-codec paths
- src/request.h: MAX_PROFILES bump 11 → 13, driver_data->is_10bit flag
Scope: COPY path (vaGetImage / vaDeriveImage) only. Standard ffmpeg-vaapi
hwdownload, mpv vaapi-copy, and any consumer using vaGetImage works
end-to-end. PRIME-path consumers that only know NV12/P010 must use the
COPY path; PRIME consumers aware of NV15 (panfrost-Mesa et al.) get the
correct fourcc on RequestExportSurfaceHandle. PRIME-side P010 emission is
follow-up scope (would need DRM_FORMAT_P010 + per-plane unpack into a
GPU-accessible buffer).
Compile-tested on boltzmann (aarch64 native, gcc 15.2.1, libva 1.23.0,
libdrm 2.4.133): clean build, .so produced, 0 new warnings.
Phase 0/2 evidence: linux-mmind-v7.0 drivers/media/platform/rockchip/rkvdec.
rkvdec_h264_decoded_fmts[] and rkvdec_hevc_decoded_fmts[] both list NV15;
ctrl tables cap at HEVC MAIN_10 and H264 HIGH_422_INTRA (Hi10P < cap, not
in menu_skip_mask). image_fmt resolution (rkvdec-h264-common.c:196,
rkvdec-hevc-common.c:467) dispatches on bit_depth_luma_minus8 only.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
161 lines
6.0 KiB
C
161 lines
6.0 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>
|
|
|
|
#define V4L2_REQUEST_STR_VENDOR "v4l2-request"
|
|
|
|
#define V4L2_REQUEST_MAX_PROFILES 13
|
|
#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;
|
|
|
|
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];
|
|
|
|
/*
|
|
* iter39: active session is decoding a 10-bit profile (Hi10P / Main10).
|
|
* Set in RequestCreateContext from config->profile. Drives:
|
|
* - CAPTURE pix_fmt selection (NV15 instead of NV12)
|
|
* - image.c DeriveImage / QueryImageFormats fourcc reporting (P010
|
|
* instead of NV12)
|
|
* - copy_surface_to_image NV15→P010 unpack branch
|
|
* Reset to false at DestroyContext.
|
|
*/
|
|
bool is_10bit;
|
|
};
|
|
|
|
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
|