forked from marfrit/libva-v4l2-request-fourier
iter6 fix: per-OUTPUT-slot request_fd binding via REINIT
iter4 (385dee1) replaced the original media_request_reinit pattern with close+media_request_alloc per frame to escape an EINVAL on S_EXT_CTRLS that turned out to be a DPB-payload bug (74d8dd1, FFmpeg V4L2_H264_FRAME_REF semantics). The per-frame close+alloc model worked for mpv vaapi-copy (single-surface recycle) but raced under Firefox 150's MediaSource pipeline (multi-surface rotation): fd=30 got reused via lowest-free-fd allocation faster than the kernel- side per-buffer state-machine could tear down the prior request, producing intermittent VIDIOC_QBUF EINVAL on OUTPUT after 1..53 successful frames. Phase 2 telemetry confirmed: - DQBUF returned the index we passed (no FIFO mismatch) - SPS/PPS/DECODE_PARAMS/SCALING_MATRIX byte-identical between mpv and Firefox first 64 bytes - Pool size bump 4 -> 16 only delayed the failure (62 frames) - Different OUTPUT slot indices failed across runs (race signature) Fix: each OUTPUT pool slot owns a permanent request_fd allocated once at request_pool_init and REINIT'd between uses in RequestSyncSurface. 1:1 slot-to-fd binding eliminates cross-slot fd reuse entirely. Pool stays driver-wide (multi-context safe per iter5 Track E); slots cycle through 16 distinct fds in round-robin acquire. Files: - request_pool.h: add request_fd field to slot struct; init signature takes media_fd - request_pool.c: alloc per-slot fd at init, close at destroy - context.c: pass driver_data->media_fd; pool size 4 -> 16 - picture.c: BeginPicture binds slot->request_fd to surface; EndPicture's per-frame media_request_alloc removed - surface.c: RequestSyncSurface uses media_request_reinit instead of close+alloc; DestroySurfaces close removed (slot owns fd); error path close removed; surface_object NULL-init for the -Wmaybe-uninitialized warning fix Empirical verification (clean build sha ebe396d5..., no diagnostic instrumentation): - Firefox 150 + bbb_1080p30_h264.mp4 + LIBVA_DRIVER_NAME=v4l2_request + sandbox enabled: 35s+ playback, zero "Unable to queue buffer" / "Unable to set control(s)", lsof shows RDD process holds /dev/video1 + /dev/media0 throughout. Driver stderr: only the single cap_pool_init: 24 slots ready line. - mpv vaapi-copy 50 frames: zero errors, "Using hardware decoding (vaapi-copy)" - no regression vs iter5-end driver. Pool-size bump diagnostic (Phase 5 sonnet design review feedback): 4 -> 16 alone took 1->62 frames, far short of the 30s success criterion (~900 frames at 30fps). REINIT discipline is the actual fix; pool 16 is comfortable headroom over typical H.264 MaxDpbFrames. Phase 5 sonnet code review: APPROVE-WITH-CHANGES (one comment attribution corrected: cleanup runs at RequestTerminate, not RequestDestroyContext, since the pool is driver-wide). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
+23
-1
@@ -14,11 +14,13 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/mman.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "media.h"
|
||||
#include "utils.h"
|
||||
#include "v4l2.h"
|
||||
|
||||
int request_pool_init(struct request_pool *pool, int video_fd,
|
||||
int request_pool_init(struct request_pool *pool, int video_fd, int media_fd,
|
||||
unsigned int output_type, unsigned int count)
|
||||
{
|
||||
unsigned int index_base;
|
||||
@@ -40,6 +42,9 @@ int request_pool_init(struct request_pool *pool, int video_fd,
|
||||
pool->count = count;
|
||||
pool->next = 0;
|
||||
|
||||
for (i = 0; i < count; i++)
|
||||
pool->slots[i].request_fd = -1;
|
||||
|
||||
rc = v4l2_create_buffers(video_fd, output_type, count, &index_base);
|
||||
if (rc < 0)
|
||||
goto error;
|
||||
@@ -63,6 +68,21 @@ int request_pool_init(struct request_pool *pool, int video_fd,
|
||||
}
|
||||
|
||||
pool->slots[i].size = length;
|
||||
|
||||
/*
|
||||
* iter6: each pool slot owns a permanent media-request fd,
|
||||
* allocated once here and REINIT'd between uses in
|
||||
* RequestSyncSurface. Replaces the iter4 close+alloc-per-
|
||||
* frame model, whose lowest-free fd reuse was racing with
|
||||
* the kernel's per-buffer state-machine teardown when the
|
||||
* consumer rotated through multiple OUTPUT pool slots
|
||||
* faster than the kernel cleanup drained (Firefox's
|
||||
* MediaSource pattern). 1:1 slot-to-fd binding eliminates
|
||||
* cross-slot fd reuse.
|
||||
*/
|
||||
pool->slots[i].request_fd = media_request_alloc(media_fd);
|
||||
if (pool->slots[i].request_fd < 0)
|
||||
goto error;
|
||||
}
|
||||
|
||||
pool->initialized = true;
|
||||
@@ -81,6 +101,8 @@ void request_pool_destroy(struct request_pool *pool)
|
||||
return;
|
||||
|
||||
for (i = 0; i < pool->count; i++) {
|
||||
if (pool->slots[i].request_fd >= 0)
|
||||
close(pool->slots[i].request_fd);
|
||||
if (pool->slots[i].data != NULL && pool->slots[i].size > 0)
|
||||
munmap(pool->slots[i].data, pool->slots[i].size);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user