claude-noether
5939ac6ae0
Follow-up to #13 (PR #14, bounds-check floor). When a stream-level resolution upshift mid-session pushes an Annex-B start code / VP8 header pad / slice payload past the OUTPUT pool slot's mmap, the bounds check used to return VA_STATUS_ERROR_ALLOCATION_FAILED and force the libva consumer to recreate the surface (losing the frame). This patch absorbs the resize transparently: 1. codec_store_buffer's three append sites call a new codec_store_buffer_ensure_capacity() before each memcpy/memset. 2. On overflow, ensure_capacity snapshots the in-flight surface's accumulated bytes, temporarily releases its OUTPUT pool slot, and calls request_pool_resize. 3. request_pool_resize STREAMOFFs the OUTPUT queue, munmaps every slot, closes every per-slot media-request fd, REQBUFS(0)s the V4L2 buffers, re-issues S_FMT with a sizeimage hint = 2× the required total (capped at 1 GiB, rounded up to a 4 KiB page), CREATE_BUFSes the original slot count, per-slot queries + mmaps + media_request_allocs, and STREAMONs. 4. ensure_capacity re-acquires a pool slot, re-mirrors source_{index,data,size,request_fd} onto the surface, and restores the saved bytes via memcpy. The cached S_FMT params (pixelformat, picture_width, picture_height) are stashed on the request_pool at init time so the resize is fully self-contained — caller passes only the new sizeimage hint. A new v4l2_set_format_sizeimage() helper accepts an explicit sizeimage override; v4l2_set_format keeps the SOURCE_SIZE_MAX (1 MiB) default for CreateContext-time S_FMT. The pre-condition for the resize is "no pool slot may be borrowed." The inline-Sync-in-EndPicture pattern (RequestEndPicture calls RequestSyncSurface before returning) guarantees that during codec_store_buffer, the only borrowed slot is the current render_surface_id's — which the resize trigger explicitly releases before invoking the pool function. request_pool_resize asserts the invariant via a busy-scan and bails loudly if anyone breaks it rather than corrupting in-flight V4L2 state. On resize failure: re-acquire the just-released slot (it was a clean busy=false flip; the resize aborted before tearing it down in the common case, or zeroed its mmap fields in the late-abort case — either way the re-acquire keeps surface_object's mirror internally consistent) and surface the original VA_STATUS_ERROR_ALLOCATION_FAILED so libva clients fall back to surface recreation as before this patch. CAPTURE side is untouched — the V4L2 stateless API treats per-queue streaming independently, so STREAMOFF/STREAMON on OUTPUT does not disrupt the CAPTURE queue, and a resolution-upshift CAPTURE budget mismatch becomes a clean V4L2_BUF_FLAG_ERROR on the next DQBUF (handled by the existing surface error path). Closes marfrit/libva-v4l2-request-fourier#15.
112 lines
4.7 KiB
C
112 lines
4.7 KiB
C
/*
|
|
* 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_H_
|
|
#define _V4L2_H_
|
|
|
|
#include <stdbool.h>
|
|
|
|
#define SOURCE_SIZE_MAX (1024 * 1024)
|
|
|
|
unsigned int v4l2_type_video_output(bool mplane);
|
|
unsigned int v4l2_type_video_capture(bool mplane);
|
|
int v4l2_query_capabilities(int video_fd, unsigned int *capabilities);
|
|
bool v4l2_find_format(int video_fd, unsigned int type,
|
|
unsigned int pixelformat);
|
|
int v4l2_set_format(int video_fd, unsigned int type, unsigned int pixelformat,
|
|
unsigned int width, unsigned int height);
|
|
/*
|
|
* Same as v4l2_set_format but explicitly overrides the OUTPUT
|
|
* sizeimage hint. Pass sizeimage=0 to get the v4l2_set_format default
|
|
* (SOURCE_SIZE_MAX for OUTPUT, 0 for CAPTURE). Used by
|
|
* request_pool_resize on a mid-session bitstream-budget overrun to
|
|
* grow the OUTPUT pool slots past the SOURCE_SIZE_MAX floor.
|
|
*/
|
|
int v4l2_set_format_sizeimage(int video_fd, unsigned int type,
|
|
unsigned int pixelformat,
|
|
unsigned int width, unsigned int height,
|
|
unsigned int sizeimage);
|
|
int v4l2_get_format(int video_fd, unsigned int type, unsigned int *width,
|
|
unsigned int *height, unsigned int *bytesperline,
|
|
unsigned int *sizes, unsigned int *planes_count);
|
|
int v4l2_create_buffers(int video_fd, unsigned int type,
|
|
unsigned int buffers_count, unsigned int *index_base);
|
|
int v4l2_query_buffer(int video_fd, unsigned int type, unsigned int index,
|
|
unsigned int *lengths, unsigned int *offsets,
|
|
unsigned int buffers_count);
|
|
int v4l2_request_buffers(int video_fd, unsigned int type,
|
|
unsigned int buffers_count);
|
|
int v4l2_queue_buffer(int video_fd, int request_fd, unsigned int type,
|
|
struct timeval *timestamp, unsigned int index,
|
|
unsigned int size, unsigned int buffers_count);
|
|
int v4l2_dequeue_buffer(int video_fd, int request_fd, unsigned int type,
|
|
unsigned int index, unsigned int buffers_count);
|
|
int v4l2_export_buffer(int video_fd, unsigned int type, unsigned int index,
|
|
unsigned int flags, int *export_fds,
|
|
unsigned int export_fds_count);
|
|
int v4l2_get_controls(int video_fd, int request_fd,
|
|
struct v4l2_ext_control *controls,
|
|
unsigned int num_controls);
|
|
int v4l2_set_controls(int video_fd, int request_fd,
|
|
struct v4l2_ext_control *controls,
|
|
unsigned int num_controls);
|
|
int v4l2_set_control(int video_fd, int request_fd, unsigned int id, void *data,
|
|
unsigned int size);
|
|
int v4l2_set_stream(int video_fd, unsigned int type, bool enable);
|
|
|
|
/*
|
|
* Capability-probe helpers. These let calling code discover what the
|
|
* backing kernel driver supports rather than hardcoding assumptions
|
|
* about specific decoder hardware.
|
|
*/
|
|
|
|
/*
|
|
* Query the metadata of an extended control by CID. Fills *qec on
|
|
* success. Returns 0 if the control exists, -1 (errno=EINVAL) if the
|
|
* driver does not expose this CID. Pass qec=NULL to test existence
|
|
* only.
|
|
*/
|
|
struct v4l2_query_ext_ctrl;
|
|
int v4l2_query_ext_ctrl(int video_fd, unsigned int id,
|
|
struct v4l2_query_ext_ctrl *qec);
|
|
|
|
/*
|
|
* Query a single menu item of a menu/intmenu control at the given
|
|
* index. Fills *qm on success. Returns 0 if the menu item exists at
|
|
* this index, -1 otherwise.
|
|
*/
|
|
struct v4l2_querymenu;
|
|
int v4l2_query_menu(int video_fd, unsigned int id, unsigned int index,
|
|
struct v4l2_querymenu *qm);
|
|
|
|
/*
|
|
* Convenience: for a menu-type control, return true iff `value` is a
|
|
* valid menu entry (i.e. the driver accepts it). Walks all menu items
|
|
* up to the control's maximum to check.
|
|
*/
|
|
bool v4l2_ctrl_menu_has_value(int video_fd, unsigned int id,
|
|
unsigned int value);
|
|
|
|
#endif
|