RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avutil/hwcontext_vaapi: Allocate public and priv device hwctx together 

This is possible because the lifetime of both coincide.
Besides reducing the number of allocations this also simplifies
access to VAAPIDeviceContext as one no longer has to
go through AVHWDeviceInternal.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2024-02-11 15:39:44 +01:00
parent cffadfe99a
commit 520c1b0a7c
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavutil/hwcontext_vaapi.c
View File

@ -75,6 +75,11 @@ typedef struct VAAPISurfaceFormat {
} VAAPISurfaceFormat; } VAAPISurfaceFormat;
typedef struct VAAPIDeviceContext { typedef struct VAAPIDeviceContext {
/**
* The public AVVAAPIDeviceContext. See hwcontext_vaapi.h for it.
*/
AVVAAPIDeviceContext p;
// Surface formats which can be used with this device. // Surface formats which can be used with this device.
VAAPISurfaceFormat *formats; VAAPISurfaceFormat *formats;
int nb_formats; int nb_formats;
@ -207,7 +212,7 @@ static int vaapi_get_image_format(AVHWDeviceContext *hwdev,
enum AVPixelFormat pix_fmt, enum AVPixelFormat pix_fmt,
VAImageFormat **image_format) VAImageFormat **image_format)
{ {
VAAPIDeviceContext *ctx = hwdev->internal->priv; VAAPIDeviceContext *ctx = hwdev->hwctx;
int i; int i;
for (i = 0; i < ctx->nb_formats; i++) { for (i = 0; i < ctx->nb_formats; i++) {
@ -224,9 +229,9 @@ static int vaapi_frames_get_constraints(AVHWDeviceContext *hwdev,
const void *hwconfig, const void *hwconfig,
AVHWFramesConstraints *constraints) AVHWFramesConstraints *constraints)
{ {
AVVAAPIDeviceContext *hwctx = hwdev->hwctx; VAAPIDeviceContext *ctx = hwdev->hwctx;
AVVAAPIDeviceContext *hwctx = &ctx->p;
const AVVAAPIHWConfig *config = hwconfig; const AVVAAPIHWConfig *config = hwconfig;
VAAPIDeviceContext *ctx = hwdev->internal->priv;
VASurfaceAttrib *attr_list = NULL; VASurfaceAttrib *attr_list = NULL;
VAStatus vas; VAStatus vas;
enum AVPixelFormat pix_fmt; enum AVPixelFormat pix_fmt;
@ -384,8 +389,8 @@ static const struct {
static int vaapi_device_init(AVHWDeviceContext *hwdev) static int vaapi_device_init(AVHWDeviceContext *hwdev)
{ {
VAAPIDeviceContext *ctx = hwdev->internal->priv; VAAPIDeviceContext *ctx = hwdev->hwctx;
AVVAAPIDeviceContext *hwctx = hwdev->hwctx; AVVAAPIDeviceContext *hwctx = &ctx->p;
VAImageFormat *image_list = NULL; VAImageFormat *image_list = NULL;
VAStatus vas; VAStatus vas;
const char *vendor_string; const char *vendor_string;
@ -474,7 +479,7 @@ fail:
static void vaapi_device_uninit(AVHWDeviceContext *hwdev) static void vaapi_device_uninit(AVHWDeviceContext *hwdev)
{ {
VAAPIDeviceContext *ctx = hwdev->internal->priv; VAAPIDeviceContext *ctx = hwdev->hwctx;
av_freep(&ctx->formats); av_freep(&ctx->formats);
} }
@ -718,7 +723,7 @@ static int vaapi_transfer_get_formats(AVHWFramesContext *hwfc,
enum AVHWFrameTransferDirection dir, enum AVHWFrameTransferDirection dir,
enum AVPixelFormat **formats) enum AVPixelFormat **formats)
{ {
VAAPIDeviceContext *ctx = hwfc->device_ctx->internal->priv; VAAPIDeviceContext *ctx = hwfc->device_ctx->hwctx;
enum AVPixelFormat *pix_fmts; enum AVPixelFormat *pix_fmts;
int i, k, sw_format_available; int i, k, sw_format_available;
@ -2007,8 +2012,7 @@ const HWContextType ff_hwcontext_type_vaapi = {
.type = AV_HWDEVICE_TYPE_VAAPI, .type = AV_HWDEVICE_TYPE_VAAPI,
.name = "VAAPI", .name = "VAAPI",
.device_hwctx_size = sizeof(AVVAAPIDeviceContext), .device_hwctx_size = sizeof(VAAPIDeviceContext),
.device_priv_size = sizeof(VAAPIDeviceContext),
.device_hwconfig_size = sizeof(AVVAAPIHWConfig), .device_hwconfig_size = sizeof(AVVAAPIHWConfig),
.frames_hwctx_size = sizeof(AVVAAPIFramesContext), .frames_hwctx_size = sizeof(AVVAAPIFramesContext),
.frames_priv_size = sizeof(VAAPIFramesContext), .frames_priv_size = sizeof(VAAPIFramesContext),