@@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09
API changes, most recent first:
+2023-09-xx - xxxxxxxxxx - lavu 58.20.100 - hwcontext_qsv.h
+ Add AVQSVFramesContext.info to support dynamic frame pools
+
2023-09-02 - xxxxxxxxxx - lavu 58.19.100 - executor.h
Add AVExecutor API
@@ -613,7 +613,7 @@ static mfxStatus frame_alloc(mfxHDL pthis, mfxFrameAllocRequest *req,
QSVFramesContext *s = ctx->internal->priv;
AVQSVFramesContext *hwctx = ctx->hwctx;
mfxFrameInfo *i = &req->Info;
- mfxFrameInfo *i1 = &hwctx->surfaces[0].Info;
+ mfxFrameInfo *i1 = hwctx->nb_surfaces ? &hwctx->surfaces[0].Info : hwctx->info;
if (!(req->Type & MFX_MEMTYPE_VIDEO_MEMORY_PROCESSOR_TARGET) ||
!(req->Type & (MFX_MEMTYPE_FROM_VPPIN | MFX_MEMTYPE_FROM_VPPOUT)) ||
@@ -1173,7 +1173,7 @@ static int qsv_init_internal_session(AVHWFramesContext *ctx,
MFX_IOPATTERN_OUT_SYSTEM_MEMORY;
par.AsyncDepth = 1;
- par.vpp.In = frames_hwctx->surfaces[0].Info;
+ par.vpp.In = frames_hwctx->nb_surfaces ? frames_hwctx->surfaces[0].Info : *frames_hwctx->info;
/* Apparently VPP requires the frame rate to be set to some value, otherwise
* init will fail (probably for the framerate conversion filter). Since we
@@ -51,7 +51,27 @@ typedef struct AVQSVDeviceContext {
* This struct is allocated as AVHWFramesContext.hwctx
*/
typedef struct AVQSVFramesContext {
- mfxFrameSurface1 *surfaces;
+ /**
+ * A pointer to mfxFrameSurface1 or mfxFrameInfo structure.
+ *
+ * When nb_surfaces is 0, it is a pointer to mfxFrameInfo structure,
+ * otherwise it is a pointer to mfxFrameSurface1.
+ */
+ union {
+ mfxFrameSurface1 *surfaces;
+ mfxFrameInfo *info;
+ };
+
+ /**
+ * Number of frames
+ *
+ * A dynamic frame pool is required when nb_surfaces is 0, otherwise
+ * a fixed frame pool is required.
+ *
+ * User should make sure the configuration can support dynamic frame
+ * allocation when dynamic frame pool is required. For example, you cannt
+ * set nb_surfaces to 0 when the child_device_type is AV_HWDEVICE_TYPE_DXVA2.
+ */
int nb_surfaces;
/**
@@ -79,7 +79,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 58
-#define LIBAVUTIL_VERSION_MINOR 19
+#define LIBAVUTIL_VERSION_MINOR 20
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \