diff mbox series

[FFmpeg-devel,18/23] avutil/hwcontext_d3d12va: Allocate pub and priv frames hwctx together

Message ID DU0P250MB0747C1924AD068F02D709D518F482@DU0P250MB0747.EURP250.PROD.OUTLOOK.COM
State New
Headers show
Series [FFmpeg-devel,01/23] avutil/hwcontext_opencl: Use proper OpenCLFramesContext | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 fail Make fate failed
andriy/make_x86 success Make finished
andriy/make_fate_x86 fail Make fate failed

Commit Message

Andreas Rheinhardt Feb. 12, 2024, 12:03 a.m. UTC
This is possible because the lifetime of both coincide.
Besides reducing the number of allocations this also simplifies
access to D3D12VAFramesContext as one no longer has to
go through AVHWFramesInternal.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavutil/hwcontext_d3d12va.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/libavutil/hwcontext_d3d12va.c b/libavutil/hwcontext_d3d12va.c
index 6b4cd22899..16c07868f3 100644
--- a/libavutil/hwcontext_d3d12va.c
+++ b/libavutil/hwcontext_d3d12va.c
@@ -36,6 +36,11 @@ 
 typedef HRESULT(WINAPI *PFN_CREATE_DXGI_FACTORY2)(UINT Flags, REFIID riid, void **ppFactory);
 
 typedef struct D3D12VAFramesContext {
+    /**
+     * The public AVD3D12VAFramesContext. See hwcontext_d3d12va.h for it.
+     */
+    AVD3D12VAFramesContext p;
+
     ID3D12Resource            *staging_download_buffer;
     ID3D12Resource            *staging_upload_buffer;
     ID3D12CommandQueue        *command_queue;
@@ -101,7 +106,7 @@  static int d3d12va_create_staging_buffer_resource(AVHWFramesContext *ctx, D3D12_
                                                   ID3D12Resource **ppResource, int download)
 {
     AVD3D12VADeviceContext *device_hwctx = ctx->device_ctx->hwctx;
-    D3D12VAFramesContext   *s            = ctx->internal->priv;
+    D3D12VAFramesContext   *s            = ctx->hwctx;
     D3D12_HEAP_PROPERTIES props = { .Type = download ? D3D12_HEAP_TYPE_READBACK : D3D12_HEAP_TYPE_UPLOAD };
     D3D12_RESOURCE_DESC desc = {
         .Dimension          = D3D12_RESOURCE_DIMENSION_BUFFER,
@@ -128,8 +133,8 @@  static int d3d12va_create_staging_buffer_resource(AVHWFramesContext *ctx, D3D12_
 static int d3d12va_create_helper_objects(AVHWFramesContext *ctx)
 {
     AVD3D12VADeviceContext *device_hwctx = ctx->device_ctx->hwctx;
-    AVD3D12VAFramesContext *frames_hwctx = ctx->hwctx;
-    D3D12VAFramesContext   *s            = ctx->internal->priv;
+    D3D12VAFramesContext   *s            = ctx->hwctx;
+    AVD3D12VAFramesContext *frames_hwctx = &s->p;
 
     D3D12_COMMAND_QUEUE_DESC queue_desc = {
         .Type     = D3D12_COMMAND_LIST_TYPE_COPY,
@@ -168,7 +173,7 @@  fail:
 
 static void d3d12va_frames_uninit(AVHWFramesContext *ctx)
 {
-    D3D12VAFramesContext *s = ctx->internal->priv;
+    D3D12VAFramesContext *s = ctx->hwctx;
 
     D3D12_OBJECT_RELEASE(s->sync_ctx.fence);
     if (s->sync_ctx.event)
@@ -345,8 +350,8 @@  static int d3d12va_transfer_data(AVHWFramesContext *ctx, AVFrame *dst,
                                  const AVFrame *src)
 {
     AVD3D12VADeviceContext *hwctx        = ctx->device_ctx->hwctx;
-    AVD3D12VAFramesContext *frames_hwctx = ctx->hwctx;
-    D3D12VAFramesContext   *s            = ctx->internal->priv;
+    D3D12VAFramesContext   *s            = ctx->hwctx;
+    AVD3D12VAFramesContext *frames_hwctx = &s->p;
 
     int ret;
     int download = src->format == AV_PIX_FMT_D3D12;
@@ -675,8 +680,7 @@  const HWContextType ff_hwcontext_type_d3d12va = {
     .name                   = "D3D12VA",
 
     .device_hwctx_size      = sizeof(D3D12VADevicePriv),
-    .frames_hwctx_size      = sizeof(AVD3D12VAFramesContext),
-    .frames_priv_size       = sizeof(D3D12VAFramesContext),
+    .frames_hwctx_size      = sizeof(D3D12VAFramesContext),
 
     .device_create          = d3d12va_device_create,
     .device_init            = d3d12va_device_init,