From patchwork Wed Apr 11 21:32:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kravchenko X-Patchwork-Id: 8409 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1175387jad; Wed, 11 Apr 2018 14:32:26 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/baN+Z3QV4LmzqcXCtXw1tqhbme+VcvN3/IZdiKiF2ekn+49C+NRJ59oew+1RIna+4rBtH X-Received: by 10.28.173.4 with SMTP id w4mr3944318wme.54.1523482346354; Wed, 11 Apr 2018 14:32:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523482346; cv=none; d=google.com; s=arc-20160816; b=F1u3Q5Zb6h714jFw33dNfxB4rJ+yH9CK+KsS2V1aArLWKMCxiTmYMooWVCdiEeNeHg zoUCxm4kRNYPDqDCJdpeR0k/B5TR6yzWysOHloTPVa1Os1LLGyWkbT+xVisaic+vZYel 7vAzLDigHKnATxaMA/xICT1+HgU4rhjBC+qp9wilmP7+P7zlD01cczJ2b+hRVm7KqUu8 xFLlzxwgmIo74tnSLKz365qnwNsOt44UTniKpVMhgdxerPka1YfPZrh6thRZ1yGKQJ2+ /+DqrdGbaekAcBNdROmVfS3Xpv90CBHJRZDklGEv8lojkxwkVWZjnOLsd8AIEi25qgFL o6+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:thread-index:content-language:mime-version :message-id:date:in-reply-to:references:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=9HfF6FzaKpyxHzKN1dnY76HX0MVD/i9oYygrAciC8VY=; b=xf9XFBjMM7eKeOdxtITJX5TC+haIu0VwKtrJuUJRCyfAa9DniXYUWViaA1xr730N/j WU/WZCrASRjRs/uPJG+cNaEe/Ri/kFst2ctlZLBTHHHayfoM9ONKo1CESeXaVfyek/MH SNIXVhhPqFol+cIC5Dm7CpudMz4q0nHJIMpTUxAQtahTQ5trNgkgjGW/3ptOKS3naOHP 1eUhxMji/rsj7o4pVGW2UBLlj3vjVDqWAwl3CF8N2ubYGjVuxPxHOk21w7VCH9/Prui4 Ljl6H1ey+BzJ/OFGNXO3Liw6MgRS3Wh0m1P6iUBP1b/xtidfRs+Xu8alOMQmFGOjQXtY harg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ChmINUVG; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p17si1425695wrp.438.2018.04.11.14.32.25; Wed, 11 Apr 2018 14:32:26 -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=@gmail.com header.s=20161025 header.b=ChmINUVG; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EF55C68A1C7; Thu, 12 Apr 2018 00:31:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f51.google.com (mail-lf0-f51.google.com [209.85.215.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44FCC68A184 for ; Thu, 12 Apr 2018 00:31:54 +0300 (EEST) Received: by mail-lf0-f51.google.com with SMTP id p142-v6so4704607lfd.6 for ; Wed, 11 Apr 2018 14:32:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:references:in-reply-to:subject:date:message-id:mime-version :content-transfer-encoding:content-language:thread-index; bh=+NSe8zxgkOhe47kIQqeBeWliNhBWidFHAFoEw1YkXtE=; b=ChmINUVGR5HRjPOluQI9OCncHnaeSmGGFohwYAxTlN8LL4t3rxF2epzgb81TIDe25X teXtFCdnXICw5xhKCd1QHVlHaOlRP2gxQE6C7ZJW3efHeuBG0x6xov2wz/9TFUB146Ii Q8TMSdwFtGzdSeZ9dPI/Qbhgc4UXxGKXx6fxaDkmFbktK01o95sKvChAlN8z/X4vliMx Vo1ZUw8pbjQ3L084L5zZr8xVDDZLANnSE28zTuS8GrwC8x+RHCl0epfT9a6KNsbdNLSG KU3cD+66+s38lxwXbsJy38gcizRy8+NAkQ5cauF1M1tZuBmtZooiX7jrwoH9ZD81MdfC m/Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:references:in-reply-to:subject:date :message-id:mime-version:content-transfer-encoding:content-language :thread-index; bh=+NSe8zxgkOhe47kIQqeBeWliNhBWidFHAFoEw1YkXtE=; b=fKJ1ymo3sloI9LjNpBpTZq/3R4oTWhxu8nRh/GG3oa3kYteopJaalvvntgL0DL3e2F cL/dZEZu8Zb7O72m4WtpNota5LjZGV3RTSk3VN4YBoC5LXmnPyWNSbDb9RiIGGNPNJJ8 9ebWFiZWKKxihwSVfIhMw9uq+GkypllGLN7QBV6CCbq0svz1JKtx8PFz1tUVyf+J+yzQ a4s0tYBjxTDKIi5xazUa2TQMckyF4KsGVzaiV66RjdIOSdtmzCsBWl39iSbmgAxBZHK9 33mCzNKxlj0qH3G//m1Dde+JP1qWus2+JkYaOlFGaD1VE8ZyGSpCDj4ukP+Hq8nJlwkR F1CQ== X-Gm-Message-State: ALQs6tC2YD8BlgM2gejHiX4413/Y+kx06HiQGM//yVqXfAhwC3DeWl5C gdcH5uROdx5k3PX05GRf+l0maeSj X-Received: by 2002:a19:9dc5:: with SMTP id g188-v6mr3981587lfe.95.1523482337604; Wed, 11 Apr 2018 14:32:17 -0700 (PDT) Received: from KAAPCWIN10 ([84.47.189.78]) by smtp.gmail.com with ESMTPSA id y70-v6sm417886lfk.24.2018.04.11.14.32.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Apr 2018 14:32:16 -0700 (PDT) From: "Alexander Kravchenko" To: "'FFmpeg development discussions and patches'" References: <002301d3d1d9$d69c43f0$83d4cbd0$@gmail.com> In-Reply-To: <002301d3d1d9$d69c43f0$83d4cbd0$@gmail.com> Date: Thu, 12 Apr 2018 00:32:15 +0300 Message-ID: <002601d3d1dc$8fe3fd10$afabf730$@gmail.com> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 15.0 Content-Language: en-us Thread-Index: AQIg9uKJxOWomL2jsrzvcMw0XwuIdKNhyj7w Subject: Re: [FFmpeg-devel] [PATCH] lavc/amfenc: device type AV_HWDEVICE_TYPE_DXVA2 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Resending patch (mailer mangled the patch) --- libavcodec/amfenc.c | 123 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 102 insertions(+), 21 deletions(-) if (device_ctx->hwctx) { AVD3D11VADeviceContext *device_d3d11 = (AVD3D11VADeviceContext *)device_ctx->hwctx; @@ -222,8 +270,28 @@ static int amf_init_context(AVCodecContext *avctx) } } } - } +#endif +#if CONFIG_DXVA2 + if (device_ctx->type == AV_HWDEVICE_TYPE_DXVA2) { + AVDXVA2DeviceContext *device_dxva2 = (AVDXVA2DeviceContext *)device_ctx->hwctx; + IDirect3DDevice9 *device_dx9 = NULL; + get_dx9_device_from_devmgr(device_dxva2->devmgr, &device_dx9, avctx); + res = ctx->context->pVtbl->InitDX9(ctx->context, device_dx9); + device_dx9->lpVtbl->Release(device_dx9); + if (res == AMF_OK) { + ctx->hw_device_ctx = av_buffer_ref(avctx->hw_device_ctx); + if (!ctx->hw_device_ctx) { + return AVERROR(ENOMEM); + } + } else { + if (res == AMF_NOT_SUPPORTED) + av_log(avctx, AV_LOG_INFO, "avctx->hw_device_ctx has D3D device which doesn't have DXVA2 interface, switching to default\n"); + else + av_log(avctx, AV_LOG_INFO, "avctx->hw_device_ctx has non-AMD device, switching to default\n"); + } + } #endif + } if (!ctx->hw_frames_ctx && !ctx->hw_device_ctx) { res = ctx->context->pVtbl->InitDX11(ctx->context, NULL, AMF_DX11_1); if (res != AMF_OK) { @@ -559,18 +627,31 @@ int ff_amf_send_frame(AVCodecContext *avctx, const AVFrame *frame) (AVHWDeviceContext*)ctx->hw_device_ctx->data) )) { AMFBuffer *frame_ref_storage_buffer; - #if CONFIG_D3D11VA - static const GUID AMFTextureArrayIndexGUID = { 0x28115527, 0xe7c3, 0x4b66, { 0x99, 0xd3, 0x4f, 0x2a, 0xe6, 0xb4, 0x7f, 0xaf } }; - ID3D11Texture2D *texture = (ID3D11Texture2D*)frame->data[0]; // actual texture - int index = (int)(size_t)frame->data[1]; // index is a slice in texture array is - set to tell AMF which slice to use - texture->lpVtbl->SetPrivateData(texture, &AMFTextureArrayIndexGUID, sizeof(index), &index); + if (((AVHWFramesContext*)frame->hw_frames_ctx->data)->device_ctx->type == AV_HWDEVICE_TYPE_D3D11VA) { + static const GUID AMFTextureArrayIndexGUID = { 0x28115527, 0xe7c3, 0x4b66, { 0x99, 0xd3, 0x4f, 0x2a, 0xe6, 0xb4, 0x7f, 0xaf } }; + + ID3D11Texture2D *texture = (ID3D11Texture2D*)frame->data[0]; // actual texture + int index = (int)(size_t)frame->data[1]; // index is a slice in texture array is - set to tell AMF which slice to use + texture->lpVtbl->SetPrivateData(texture, &AMFTextureArrayIndexGUID, sizeof(index), &index); - res = ctx->context->pVtbl->CreateSurfaceFromDX11Native(ctx->context, texture, &surface, NULL); // wrap to AMF surface - AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR(ENOMEM), "CreateSurfaceFromDX11Native() failed with error %d\n", res); + res = ctx->context->pVtbl->CreateSurfaceFromDX11Native(ctx->context, texture, &surface, NULL); // wrap to AMF surface + AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR(ENOMEM), "CreateSurfaceFromDX11Native() failed with error %d\n", res); - // input HW surfaces can be vertically aligned by 16; tell AMF the real size - surface->pVtbl->SetCrop(surface, 0, 0, frame->width, frame->height); + // input HW surfaces can be vertically aligned by 16; tell AMF the real size + surface->pVtbl->SetCrop(surface, 0, 0, frame->width, frame->height); + } +#endif +#if CONFIG_DXVA2 + if (((AVHWFramesContext*)frame->hw_frames_ctx->data)->device_ctx->type == AV_HWDEVICE_TYPE_DXVA2) { + 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); + + // input HW surfaces can be vertically aligned by 16; tell AMF the real size + surface->pVtbl->SetCrop(surface, 0, 0, frame->width, frame->height); + } #endif frame_ref_storage_buffer = amf_create_buffer_with_frame_ref(frame, ctx->context); diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index b9418b6791..c1f65f909d 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -24,6 +24,9 @@ #if CONFIG_D3D11VA #include "libavutil/hwcontext_d3d11va.h" #endif +#if CONFIG_DXVA2 +#include "libavutil/hwcontext_dxva2.h" +#endif #include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "libavutil/time.h" @@ -50,6 +53,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 }; @@ -69,6 +75,7 @@ static const FormatMap format_map[] = { AV_PIX_FMT_YUV420P, AMF_SURFACE_YUV420P }, { AV_PIX_FMT_YUYV422, AMF_SURFACE_YUY2 }, { AV_PIX_FMT_D3D11, AMF_SURFACE_NV12 }, + { AV_PIX_FMT_DXVA2_VLD, AMF_SURFACE_NV12 }, }; @@ -152,6 +159,23 @@ static int amf_load_library(AVCodecContext *avctx) return 0; } +static void get_dx9_device_from_devmgr(IDirect3DDeviceManager9 *devmgr, IDirect3DDevice9 **device, void *avcl) +{ + HRESULT hr; + HANDLE device_handle; + + if (SUCCEEDED(devmgr->lpVtbl->OpenDeviceHandle(devmgr, &device_handle))) { + if (SUCCEEDED(devmgr->lpVtbl->LockDevice(devmgr, device_handle, device, FALSE))) { + devmgr->lpVtbl->UnlockDevice(devmgr, device_handle, FALSE); + } else { + av_log(avcl, AV_LOG_INFO, "Failed to lock device handle for Direct3D9 device: %lx.\n", (unsigned long)hr); + } + devmgr->lpVtbl->CloseDeviceHandle(devmgr, device_handle); + } else { + av_log(avcl, AV_LOG_INFO, "Failed to open device handle for Direct3D9 device: %lx.\n", (unsigned long)hr); + } +} + static int amf_init_context(AVCodecContext *avctx) { AmfContext *ctx = avctx->priv_data; @@ -177,34 +201,58 @@ static int amf_init_context(AVCodecContext *avctx) res = ctx->factory->pVtbl->CreateContext(ctx->factory, &ctx->context); AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR_UNKNOWN, "CreateContext() failed with error %d\n", res); // try to reuse existing DX device -#if CONFIG_D3D11VA if (avctx->hw_frames_ctx) { - AVHWFramesContext *device_ctx = (AVHWFramesContext*)avctx->hw_frames_ctx->data; - if (device_ctx->device_ctx->type == AV_HWDEVICE_TYPE_D3D11VA) { - if (amf_av_to_amf_format(device_ctx->sw_format) != AMF_SURFACE_UNKNOWN) { - if (device_ctx->device_ctx->hwctx) { - AVD3D11VADeviceContext *device_d3d11 = (AVD3D11VADeviceContext *)device_ctx->device_ctx->hwctx; + AVHWFramesContext *frames_ctx = (AVHWFramesContext*)avctx->hw_frames_ctx->data; + if (amf_av_to_amf_format(frames_ctx->sw_format) != AMF_SURFACE_UNKNOWN) { + if (frames_ctx->device_ctx->hwctx) { +#if CONFIG_D3D11VA + if (frames_ctx->device_ctx->type == AV_HWDEVICE_TYPE_D3D11VA) { + AVD3D11VADeviceContext *device_d3d11 = (AVD3D11VADeviceContext *)frames_ctx->device_ctx->hwctx; res = ctx->context->pVtbl->InitDX11(ctx->context, device_d3d11->device, AMF_DX11_1); if (res == AMF_OK) { ctx->hw_frames_ctx = av_buffer_ref(avctx->hw_frames_ctx); if (!ctx->hw_frames_ctx) { return AVERROR(ENOMEM); } - if (device_ctx->initial_pool_size > 0) - ctx->hwsurfaces_in_queue_max = device_ctx->initial_pool_size - 1; + if (frames_ctx->initial_pool_size > 0) + ctx->hwsurfaces_in_queue_max = frames_ctx->initial_pool_size - 1; } else { - if(res == AMF_NOT_SUPPORTED) + if (res == AMF_NOT_SUPPORTED) av_log(avctx, AV_LOG_INFO, "avctx->hw_frames_ctx has D3D11 device which doesn't have D3D11VA interface, switching to default\n"); else av_log(avctx, AV_LOG_INFO, "avctx->hw_frames_ctx has non-AMD device, switching to default\n"); } } - } else { - av_log(avctx, AV_LOG_INFO, "avctx->hw_frames_ctx has format not uspported by AMF, switching to default\n"); +#endif +#if CONFIG_DXVA2 + if (frames_ctx->device_ctx->type == AV_HWDEVICE_TYPE_DXVA2) { + AVDXVA2DeviceContext *device_dxva2 = (AVDXVA2DeviceContext *)frames_ctx->device_ctx->hwctx; + IDirect3DDevice9 *device_dx9 = NULL; + get_dx9_device_from_devmgr(device_dxva2->devmgr, &device_dx9, avctx); + res = ctx->context->pVtbl->InitDX9(ctx->context, device_dx9); + device_dx9->lpVtbl->Release(device_dx9); + if (res == AMF_OK) { + ctx->hw_frames_ctx = av_buffer_ref(avctx->hw_frames_ctx); + if (!ctx->hw_frames_ctx) { + return AVERROR(ENOMEM); + } + if (frames_ctx->initial_pool_size > 0) + ctx->hwsurfaces_in_queue_max = frames_ctx->initial_pool_size - 1; + } else { + if (res == AMF_NOT_SUPPORTED) + av_log(avctx, AV_LOG_INFO, "avctx->hw_frames_ctx has D3D device which doesn't have DXVA2 interface, switching to default\n"); + else + av_log(avctx, AV_LOG_INFO, "avctx->hw_frames_ctx has non-AMD device, switching to default\n"); + } + } +#endif } + } else { + av_log(avctx, AV_LOG_INFO, "avctx->hw_frames_ctx has format not uspported by AMF, switching to default\n"); } } else if (avctx->hw_device_ctx) { AVHWDeviceContext *device_ctx = (AVHWDeviceContext*)(avctx->hw_device_ctx->data); +#if CONFIG_D3D11VA if (device_ctx->type == AV_HWDEVICE_TYPE_D3D11VA) {