forked from marfrit/libva-v4l2-request-fourier
claude-noether
70196f8065
Phase 7 empirical: all 5 libva codecs returned all-zero because CreateContext's surfaces_ids[] walk was a no-op for ffmpeg-vaapi-copy which passes surfaces_count=0 to vaCreateContext (per the iter6 comment at context.c:262). Surfaces existed in driver_data's surface_heap but weren't in the param array → destination_* stayed at the zero initialization from CreateSurfaces2 β → BeginPicture's surface_bind_slot saw destination_planes_count=0 → no data assignment → copy_surface_to_image read all-zero. Fix: cache the format-uniform CAPTURE geometry in driver_data (fmt_valid, fmt_planes_count, fmt_buffers_count, fmt_format_height, fmt_sizes[], fmt_bytesperlines[]). Populate at CreateContext after v4l2_get_format(CAPTURE). Walk surface_heap (not just surfaces_ids[]) to fill every existing surface. Add lazy-fill in CreateSurfaces2 for surfaces created AFTER CreateContext. Invalidate cache in DestroyContext. New helper: surface_fill_format_uniform(driver_data, surface_object). Idempotent on destination_planes_count != 0. Signed-off-by: claude-noether <claude-noether@reauktion.de>
121 lines
4.5 KiB
C
121 lines
4.5 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 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;
|
|
|
|
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);
|
|
|
|
#endif
|