From patchwork Mon Jun 12 22:40:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 3949 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp78244vsw; Mon, 12 Jun 2017 15:43:41 -0700 (PDT) X-Received: by 10.223.139.158 with SMTP id o30mr643094wra.178.1497307421415; Mon, 12 Jun 2017 15:43:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497307421; cv=none; d=google.com; s=arc-20160816; b=EWfI++XPQRtDTQkBfq6K9BpDPA6Zzyd61dcY7ob+tYlm0vW+etxnnSBxMLEwf4DiqU m7HeuR4DXRz+7n0y7iuN4yU+C7bLldyuhgBo9zZLngVaM4eFRVvhiKAD4YQ/pj9v780i YSPduoPzvjb2OM5dmm3TM2cX/Li5CkEkXiYEkF6H64fgrFRC/qux94eqQPIhZzo17E+P jI/KD3fFMe4dyz6o5fyeGaWHTHbvKRACCqk5TzsH25R0KjcZWascKxhW8jRWuijuF+x4 4F5KTbI+QC0+ULZTCZs6WefKdDpd4rW7S0Fu41bmy+JuPE/l72ELh3PZzRhEZERkseVf grOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=e66sm14Ter9He9uZ+8+V5DoGX4E4voSlsl5kbCWRYxA=; b=rcDLl505taQMz17RBp2aCYIVyCe5Xvl9vLKjoHy5cHQs/vNaT7SptmxTYx5JXCce4i fLMafCJfy2DN0EOe7iMf2Ce/2deWPoc1S83Ki2lqXXHq5MP/TJJOznKs3vgMh92Y2qOl Vzm+aESIuJvO2BJMbeeSkmSqi/ItVkSzuxw3l42g3lPE5sDMU3YyB8YiIdVAaocspaZ7 6ZLSq9Iq8eaHP0rWTHlXNUmxgtP5iJP7z6bXUGWyemukXC0/vKuaYEFcd5oNqvkJeBXC CB+4ZVGl9ahhMde+Ifzsa+ozLcE5DQkw6B+muboJIUSnCNojJCcK7ZbNX0EU0y3xd6S0 HGMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.b=j1dJZMq+; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h62si8624750wmh.151.2017.06.12.15.43.40; Mon, 12 Jun 2017 15:43:41 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.b=j1dJZMq+; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A67DA68A0A0; Tue, 13 Jun 2017 01:41:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f169.google.com (mail-wr0-f169.google.com [209.85.128.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D531868A06C for ; Tue, 13 Jun 2017 01:41:11 +0300 (EEST) Received: by mail-wr0-f169.google.com with SMTP id v104so113616875wrb.0 for ; Mon, 12 Jun 2017 15:41:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=JMa0cVP4pkEjRwstb79CI7Qsp39t7rz/BraLOnuQcCA=; b=j1dJZMq+lCWexATKfxlpQVwOlq/yk+S0XjpM9GtaxXX8lB0u5mGuPH8kw0ZWTDQD35 9T4s8HQ8Ks0W5l9O5C7xg4ubwlR+8vgaP4hCsnMPf9c73j/anHn6V68o/QC3eW3zMMzW iHHJ9zc5ld1+bgJGNxpTmEISjqgjKPVkXe+df3n+FiKw1x/QoRouwhlFqGICoSBl6Ehh PClU3cOc8iO69SPKiMT/DEFSzgJCQoFnwjf8zbFRR7BQ2s5WeA8n/SyHJksYMMzSVuYr hgc1tGeyuHbLaib4t9nw4N0mKTdkTertZItAT3Ktu97BBr7maS8sHRr2m7nYOZ4q3YrG vpog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=JMa0cVP4pkEjRwstb79CI7Qsp39t7rz/BraLOnuQcCA=; b=IYTbh6NIcQQQzquv0vnJWQe1GHIGybaVgXKypHzuVxP8YJPtSDi9+fvmT4rpsPBg4h huDE9qwA7IMlx+otVfypJsZoXVfVP3cuYVThobTkzoPMQ0RNIP5UR5Ibkm4G3dqQ9Ui1 yimBSbSfIAS3Sf5jvmcEe0GYuPEAuJ4UMBcjm7DGasn+ERbWvCZJqB2qRGRi/yvowzlX Is6OeVqmOg3MmHuIEsCEgtyDdFS2elDeugCVONXe1RL27m9hIEyKe1QDYreS5OyuBBe3 VcUwzrRB08lCl5bpAVdszp1NHzk0FxGJRORljMkEKOTmjlwMXc8+Bc4SElD14gQgpMru n1qg== X-Gm-Message-State: AKS2vOwNgJKr+xA+NCuVJnr/dey3hTCS+rBjcNo5qzbXXYF0ZYVA1jNy HKT4j5PtjmL8CVMhakA= X-Received: by 10.28.203.65 with SMTP id b62mr9202791wmg.9.1497307273383; Mon, 12 Jun 2017 15:41:13 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id m191sm13098233wmg.30.2017.06.12.15.41.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jun 2017 15:41:12 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Jun 2017 23:40:34 +0100 Message-Id: <20170612224041.6750-18-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170612224041.6750-1-sw@jkqxz.net> References: <20170612224041.6750-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 17/24] hwcontext_qsv: Support derivation from child devices X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" (cherry picked from commit aa51bb3d2756ed912ee40645efccf5f4a9609696) --- libavutil/hwcontext_qsv.c | 113 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 84 insertions(+), 29 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 5550ffe143..505a8e709d 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -792,21 +792,96 @@ static mfxIMPL choose_implementation(const char *device) return impl; } -static int qsv_device_create(AVHWDeviceContext *ctx, const char *device, - AVDictionary *opts, int flags) +static int qsv_device_derive_from_child(AVHWDeviceContext *ctx, + mfxIMPL implementation, + AVHWDeviceContext *child_device_ctx, + int flags) { AVQSVDeviceContext *hwctx = ctx->hwctx; - QSVDevicePriv *priv; - enum AVHWDeviceType child_device_type; - AVDictionaryEntry *e; + QSVDeviceContext *s = ctx->internal->priv; mfxVersion ver = { { 3, 1 } }; - mfxIMPL impl; mfxHDL handle; mfxHandleType handle_type; mfxStatus err; int ret; + switch (child_device_ctx->type) { +#if CONFIG_VAAPI + case AV_HWDEVICE_TYPE_VAAPI: + { + AVVAAPIDeviceContext *child_device_hwctx = child_device_ctx->hwctx; + handle_type = MFX_HANDLE_VA_DISPLAY; + handle = (mfxHDL)child_device_hwctx->display; + } + break; +#endif +#if CONFIG_DXVA2 + case AV_HWDEVICE_TYPE_DXVA2: + { + AVDXVA2DeviceContext *child_device_hwctx = child_device_ctx->hwctx; + handle_type = MFX_HANDLE_D3D9_DEVICE_MANAGER; + handle = (mfxHDL)child_device_hwctx->devmgr; + } + break; +#endif + default: + ret = AVERROR(ENOSYS); + goto fail; + } + + err = MFXInit(implementation, &ver, &hwctx->session); + if (err != MFX_ERR_NONE) { + av_log(ctx, AV_LOG_ERROR, "Error initializing an MFX session: " + "%d.\n", err); + ret = AVERROR_UNKNOWN; + goto fail; + } + + err = MFXVideoCORE_SetHandle(hwctx->session, handle_type, handle); + if (err != MFX_ERR_NONE) { + av_log(ctx, AV_LOG_ERROR, "Error setting child device handle: " + "%d\n", err); + ret = AVERROR_UNKNOWN; + goto fail; + } + + ret = qsv_device_init(ctx); + if (ret < 0) + goto fail; + if (s->handle_type != handle_type) { + av_log(ctx, AV_LOG_ERROR, "Error in child device handle setup: " + "type mismatch (%d != %d).\n", s->handle_type, handle_type); + err = AVERROR_UNKNOWN; + goto fail; + } + + return 0; + +fail: + if (hwctx->session) + MFXClose(hwctx->session); + return ret; +} + +static int qsv_device_derive(AVHWDeviceContext *ctx, + AVHWDeviceContext *child_device_ctx, int flags) +{ + return qsv_device_derive_from_child(ctx, MFX_IMPL_HARDWARE_ANY, + child_device_ctx, flags); +} + +static int qsv_device_create(AVHWDeviceContext *ctx, const char *device, + AVDictionary *opts, int flags) +{ + QSVDevicePriv *priv; + enum AVHWDeviceType child_device_type; + AVHWDeviceContext *child_device; + AVDictionaryEntry *e; + + mfxIMPL impl; + int ret; + priv = av_mallocz(sizeof(*priv)); if (!priv) return AVERROR(ENOMEM); @@ -830,32 +905,11 @@ static int qsv_device_create(AVHWDeviceContext *ctx, const char *device, if (ret < 0) return ret; - { - AVHWDeviceContext *child_device_ctx = (AVHWDeviceContext*)priv->child_device_ctx->data; -#if CONFIG_VAAPI - AVVAAPIDeviceContext *child_device_hwctx = child_device_ctx->hwctx; - handle_type = MFX_HANDLE_VA_DISPLAY; - handle = (mfxHDL)child_device_hwctx->display; -#elif CONFIG_DXVA2 - AVDXVA2DeviceContext *child_device_hwctx = child_device_ctx->hwctx; - handle_type = MFX_HANDLE_D3D9_DEVICE_MANAGER; - handle = (mfxHDL)child_device_hwctx->devmgr; -#endif - } + child_device = (AVHWDeviceContext*)priv->child_device_ctx->data; impl = choose_implementation(device); - err = MFXInit(impl, &ver, &hwctx->session); - if (err != MFX_ERR_NONE) { - av_log(ctx, AV_LOG_ERROR, "Error initializing an MFX session\n"); - return AVERROR_UNKNOWN; - } - - err = MFXVideoCORE_SetHandle(hwctx->session, handle_type, handle); - if (err != MFX_ERR_NONE) - return AVERROR_UNKNOWN; - - return 0; + return qsv_device_derive_from_child(ctx, impl, child_device, 0); } const HWContextType ff_hwcontext_type_qsv = { @@ -868,6 +922,7 @@ const HWContextType ff_hwcontext_type_qsv = { .frames_priv_size = sizeof(QSVFramesContext), .device_create = qsv_device_create, + .device_derive = qsv_device_derive, .device_init = qsv_device_init, .frames_get_constraints = qsv_frames_get_constraints, .frames_init = qsv_frames_init,