From patchwork Sat Apr 14 15:53:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 8445 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1941799jad; Sat, 14 Apr 2018 09:00:22 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+Pa1vFQrxuicDEbtOOZ7hzHEOPIEsaGK/p1kICpUWzaLDhWW5iPNZQL/1BVYhuBKrgEqpv X-Received: by 10.28.136.4 with SMTP id k4mr6580822wmd.133.1523721622025; Sat, 14 Apr 2018 09:00:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523721621; cv=none; d=google.com; s=arc-20160816; b=fEwg0DiM9icijbBP0ARWoQZluj1/WRZTRxMz9x5azbCQg50URiRkXFaxvN/Jnhb4vV MZpgMFLHLiJG1loSpEeCwpu2X2SFYxMi80zN9Sl2b4FS0SbjdwulpfTtJJodc7tAwWJn lnia3s9NcOCgc9UclFqsfMPqLX/DKY+C4lSA40/fY/qzyKwiS/bLuB5mdZ6zaLYdp9QW oawsp7/pki+6d0I+IOaKy5DXfLtIkFXQK77ctnQ+zIRzBPtw5L8W2VN/Ct7P4qI4YF6e K4wV4etjleiIGA8oMuiMxxiBVsUB1JdCzROy9r5efr3HPvGHmG/KPEXZzrtLD8cQ5twE wroA== 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=IPGMr9+Oy8djRYC20r0M+hguPmHwCRRPInqWXhiHL/w=; b=Tp+LY9W4an2SSsE+usP13jpMS2GCDrKdFgLNnuD44fvdgMEEGTojdrCYvlmJImQoxN 2+fh+tzas8s+flD+IMSu2A6NCRcNhydkO972hw9NLr6pKbYywzHUGiYEd7Qtw0RKaoEC KllP3XeE5NJqLebraSA69WlLc0KkexNVEBFtNaCnGqqyF8mC0i0oZHDIeGM3qxgiK7Zc JIaPgvmbaAUl1CY5KczX90TZOzaOy1qMykDQDxDwNOxOpt8AKRFAq4o8sZSIHNTBQ3Bt uye+GEGxvki0X2K+JprRkuVi7vm9+rwOuCqHKOKHjNC/ISYIBTSQbfwTaxXkL1XFiN8a rRbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=M9Foj5d2; 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 z76si3312332wmh.120.2018.04.14.09.00.21; Sat, 14 Apr 2018 09:00:21 -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.s=20150623 header.b=M9Foj5d2; 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 0E243689EEF; Sat, 14 Apr 2018 18:59:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 342B8689982 for ; Sat, 14 Apr 2018 18:59:48 +0300 (EEST) Received: by mail-wr0-f194.google.com with SMTP id v60so11232444wrc.7 for ; Sat, 14 Apr 2018 09:00:13 -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=REjgJYJIO9Iyz9XFQfhpBgcqZHT6/z7nd7DeHhyKlYY=; b=M9Foj5d2qzcIakooTGdFDaLKeF0D+A4xLhd8/zrCXjMEdsY6H/pPQDsourtapJCsKt 2qHNldSi4WXoKpA0Xq6ycR424EgA4FcAng6qTpW6ebFvPzwUiC5o5WSUHbE3wASMHptL wsalEgNqvpJvypGBnC/vQAVPt9pQQ42hz/ZoBEIFn20MGx/j3djntywbv0FyTbVlRCD+ gefZplmoC6PT86ikWdOJyWX+Wo7vB9sAyvYm5OzbAlMZ3JwV4Xl0fbEJkTE79fZXscc9 ZytDsZ8tb/v1CNm/VA9FkFQz1HRQiL6sOM+0F0RjLycfVMt2jj6/OyIvWy33Ig/APasf 6YhA== 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=REjgJYJIO9Iyz9XFQfhpBgcqZHT6/z7nd7DeHhyKlYY=; b=tZKS+3SJPtMQy6rBtcwoWoMTVXM8CEIXtWPbojyfNSe0FNcJ/XK22bX4HZfDdEZJ+A AnjquDhhB+b7bKxVc73Hby6YZay7SvUuQQ9XUo9GsRrky8xS4yXuVhhz467m/7Q4aC5Q t5MdTNKwh/CHcUk68gNpWLZtebVTHOFdQKo1gg6lR2zAheNOippOYkKu5SUJQ1l3sByj L4XRxpfJ+IvlufAdkJpWvvAwjT08t3Fcm4gJL3oavHQXQ8XWnKIQvtaII9BXfUbGmw/t pG+qd7YaPJBCn6irnwoNfLfn6Ttytx/WnqeqhFULPxRcuW4kLgHcISTNaGhTxHhRFocu E3jw== X-Gm-Message-State: ALQs6tBGoFZmpxKBhRnejaMqBZGLrFAIFZS3uN1de5Vf+z/w8o/bkSUm NhDvkrh/1x7SM+YpV4uCc54Zqjmf X-Received: by 10.28.111.16 with SMTP id k16mr5898330wmc.35.1523721229745; Sat, 14 Apr 2018 08:53:49 -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 n49sm13651823wrn.50.2018.04.14.08.53.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 14 Apr 2018 08:53:49 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Apr 2018 16:53:38 +0100 Message-Id: <20180414155339.22839-4-sw@jkqxz.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180414155339.22839-1-sw@jkqxz.net> References: <20180414155339.22839-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 4/5] amfenc: Add DXVA2 hardware frame input support 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" From: Alexander Kravchenko Adds support for AMF initialisation from a DXVA2 (Direct3D9) device, and then allows passing DXVA2 surfaces into an AMF encoder. Signed-off-by: Mark Thompson --- libavcodec/amfenc.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index b761cd74bf..e641048532 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -24,6 +24,10 @@ #if CONFIG_D3D11VA #include "libavutil/hwcontext_d3d11va.h" #endif +#if CONFIG_DXVA2 +#define COBJMACROS +#include "libavutil/hwcontext_dxva2.h" +#endif #include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "libavutil/time.h" @@ -50,6 +54,9 @@ const enum AVPixelFormat ff_amf_pix_fmts[] = { AV_PIX_FMT_YUV420P, #if CONFIG_D3D11VA AV_PIX_FMT_D3D11, +#endif +#if CONFIG_DXVA2 + AV_PIX_FMT_DXVA2_VLD, #endif AV_PIX_FMT_NONE }; @@ -162,6 +169,52 @@ static int amf_init_from_d3d11_device(AVCodecContext *avctx, AVD3D11VADeviceCont } #endif +#if CONFIG_DXVA2 +static int amf_init_from_dxva2_device(AVCodecContext *avctx, AVDXVA2DeviceContext *hwctx) +{ + AmfContext *ctx = avctx->priv_data; + HANDLE device_handle; + IDirect3DDevice9 *device; + HRESULT hr; + AMF_RESULT res; + int ret; + + hr = IDirect3DDeviceManager9_OpenDeviceHandle(hwctx->devmgr, &device_handle); + if (FAILED(hr)) { + av_log(avctx, AV_LOG_ERROR, "Failed to open device handle for Direct3D9 device: %lx.\n", (unsigned long)hr); + return AVERROR_EXTERNAL; + } + + hr = IDirect3DDeviceManager9_LockDevice(hwctx->devmgr, device_handle, &device, FALSE); + if (SUCCEEDED(hr)) { + IDirect3DDeviceManager9_UnlockDevice(hwctx->devmgr, device_handle, FALSE); + ret = 0; + } else { + av_log(avctx, AV_LOG_ERROR, "Failed to lock device handle for Direct3D9 device: %lx.\n", (unsigned long)hr); + ret = AVERROR_EXTERNAL; + } + + IDirect3DDeviceManager9_CloseDeviceHandle(hwctx->devmgr, device_handle); + + if (ret < 0) + return ret; + + res = ctx->context->pVtbl->InitDX9(ctx->context, device); + + IDirect3DDevice9_Release(device); + + if (res != AMF_OK) { + if (res == AMF_NOT_SUPPORTED) + av_log(avctx, AV_LOG_ERROR, "AMF via D3D9 is not supported on the given device.\n"); + else + av_log(avctx, AV_LOG_ERROR, "AMF failed to initialise on given D3D9 device: %d.\n", res); + return AVERROR(ENODEV); + } + + return 0; +} +#endif + static int amf_init_context(AVCodecContext *avctx) { AmfContext *ctx = avctx->priv_data; @@ -205,6 +258,13 @@ static int amf_init_context(AVCodecContext *avctx) if (ret < 0) return ret; break; +#endif +#if CONFIG_DXVA2 + case AV_HWDEVICE_TYPE_DXVA2: + ret = amf_init_from_dxva2_device(avctx, frames_ctx->device_ctx->hwctx); + if (ret < 0) + return ret; + break; #endif default: av_log(avctx, AV_LOG_ERROR, "AMF initialisation from a %s frames context is not supported.\n", @@ -229,6 +289,13 @@ static int amf_init_context(AVCodecContext *avctx) if (ret < 0) return ret; break; +#endif +#if CONFIG_DXVA2 + case AV_HWDEVICE_TYPE_DXVA2: + ret = amf_init_from_dxva2_device(avctx, device_ctx->hwctx); + if (ret < 0) + return ret; + break; #endif default: av_log(avctx, AV_LOG_ERROR, "AMF initialisation from a %s device is not supported.\n", @@ -580,6 +647,18 @@ int ff_amf_send_frame(AVCodecContext *avctx, const AVFrame *frame) hw_surface = 1; } break; +#endif +#if CONFIG_DXVA2 + case AV_PIX_FMT_DXVA2_VLD: + { + IDirect3DSurface9 *texture = (IDirect3DSurface9 *)frame->data[3]; // actual texture + + res = ctx->context->pVtbl->CreateSurfaceFromDX9Native(ctx->context, texture, &surface, NULL); // wrap to AMF surface + AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR(ENOMEM), "CreateSurfaceFromDX9Native() failed with error %d\n", res); + + hw_surface = 1; + } + break; #endif default: {