virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

hwcontext_vaapi: Factorise out common connection code

Browse Source 
This was duplicated between normal device creation and creation by
derivation from a DRM device.
This commit is contained in:
Mark Thompson
2017-10-01 22:51:31 +01:00
parent e339411691
commit 5f39788668
1 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
libavutil/hwcontext_vaapi.c
View File

@@ -1094,14 +1094,32 @@ static void vaapi_device_free(AVHWDeviceContext *ctx)
av_freep(&priv); av_freep(&priv);
} }
static int vaapi_device_connect(AVHWDeviceContext *ctx,
VADisplay display)
{
AVVAAPIDeviceContext *hwctx = ctx->hwctx;
int major, minor;
VAStatus vas;
hwctx->display = display;
vas = vaInitialize(display, &major, &minor);
if (vas != VA_STATUS_SUCCESS) {
av_log(ctx, AV_LOG_ERROR, "Failed to initialise VAAPI "
"connection: %d (%s).\n", vas, vaErrorStr(vas));
return AVERROR(EIO);
}
av_log(ctx, AV_LOG_VERBOSE, "Initialised VAAPI connection: "
"version %d.%d\n", major, minor);
return 0;
}
static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device,
AVDictionary *opts, int flags) AVDictionary *opts, int flags)
{ {
AVVAAPIDeviceContext *hwctx = ctx->hwctx;
VAAPIDevicePriv *priv; VAAPIDevicePriv *priv;
VADisplay display = 0; VADisplay display = NULL;
VAStatus vas;
int major, minor;
priv = av_mallocz(sizeof(*priv)); priv = av_mallocz(sizeof(*priv));
if (!priv) if (!priv)
@@ -1163,18 +1181,7 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device,
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
hwctx->display = display; return vaapi_device_connect(ctx, display);
vas = vaInitialize(display, &major, &minor);
if (vas != VA_STATUS_SUCCESS) {
av_log(ctx, AV_LOG_ERROR, "Failed to initialise VAAPI "
"connection: %d (%s).\n", vas, vaErrorStr(vas));
return AVERROR(EIO);
}
av_log(ctx, AV_LOG_VERBOSE, "Initialised VAAPI connection: "
"version %d.%d\n", major, minor);
return 0;
} }
static int vaapi_device_derive(AVHWDeviceContext *ctx, static int vaapi_device_derive(AVHWDeviceContext *ctx,
@@ -1183,11 +1190,8 @@ static int vaapi_device_derive(AVHWDeviceContext *ctx,
#if CONFIG_LIBDRM #if CONFIG_LIBDRM
if (src_ctx->type == AV_HWDEVICE_TYPE_DRM) { if (src_ctx->type == AV_HWDEVICE_TYPE_DRM) {
AVDRMDeviceContext *src_hwctx = src_ctx->hwctx; AVDRMDeviceContext *src_hwctx = src_ctx->hwctx;
AVVAAPIDeviceContext *hwctx = ctx->hwctx;
VADisplay *display; VADisplay *display;
VAStatus vas;
VAAPIDevicePriv *priv; VAAPIDevicePriv *priv;
int major, minor;
if (src_hwctx->fd < 0) { if (src_hwctx->fd < 0) {
av_log(ctx, AV_LOG_ERROR, "DRM instance requires an associated " av_log(ctx, AV_LOG_ERROR, "DRM instance requires an associated "
@@ -1212,16 +1216,7 @@ static int vaapi_device_derive(AVHWDeviceContext *ctx,
return AVERROR(EIO); return AVERROR(EIO);
} }
hwctx->display = display; return vaapi_device_connect(ctx, display);
vas = vaInitialize(display, &major, &minor);
if (vas != VA_STATUS_SUCCESS) {
av_log(ctx, AV_LOG_ERROR, "Failed to initialise VAAPI "
"connection: %d (%s).\n", vas, vaErrorStr(vas));
return AVERROR(EIO);
}
return 0;
} }
#endif #endif
return AVERROR(ENOSYS); return AVERROR(ENOSYS);