From patchwork Wed Jun 19 15:03:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitrii Ovchinnikov X-Patchwork-Id: 13612 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 569A7447D15 for ; Wed, 19 Jun 2019 18:09:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2F32A68A708; Wed, 19 Jun 2019 18:09:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB5AF689CF3 for ; Wed, 19 Jun 2019 18:09:24 +0300 (EEST) Received: by mail-lj1-f195.google.com with SMTP id s21so3618034lji.8 for ; Wed, 19 Jun 2019 08:09:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uXpY5dSRrXmZwXT+pYfx5y4wGK4NwZGPFU4cZVQUSW8=; b=gBfHWd876HIFERNlBFGQnLVe5r664+dNGqyDrDhgFpcQxnZdQzmrT7YGWgzv8jkbWA SaTFeMq5PJE3jCMYr3c21LftRICQXYqm9oLjLYRjXuQpvJhYVodXlcxGdJNME1zz+MQP /nkuOB9w6VJ4Wc3rZy9w7U/FhvAlM3rhcQtqTxqeaLLb9qhgheFvi8ZgLc1OCQCQNzzL MqSjGcuhmgmDvMqH8B1Ysuf1iEeFFHk6+xKYxrUbDBPKmZw8GroQ2fIeQ1O0mQi+Hz5A DyD8Jwe1vvMyf29yCAV4IH+61wmcit2Bu4BVAXven3hg0qnNzMEMD031EMviJFJE/gvh Ll9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uXpY5dSRrXmZwXT+pYfx5y4wGK4NwZGPFU4cZVQUSW8=; b=aO3qwkMAk//bGmcJtsQ58Jelytid9GX3wA1+ZkbU4EoHWnoWCi3GbJ2H0gqBM4ozaZ +oaBfG5WModT7Zye6pIWmpIESYWCA9s1OeoVmXvY8YwTWVSInJJkYWmpOjpqPvE7Q9nn MIA6nDadHpNl37jy5aya6Yr5YUit8s0XYdPXWevidc7Ed3mk8imKPPoR/B8i6Wu4s0H4 NQBhE50nLUh9v7lMyt18uJLfYFTzu/fSQQnnDqFZ4LtHWezB2nWisAvmtSzvlG48daK8 OMpAhsg3R0d+o1gAyqsOuyaShR2Djfm/JXmTGyoGbJfx96vekMF/9xsrhh+kQ0p15Vtd OlTw== X-Gm-Message-State: APjAAAVGhc421kanhItzMC/pI5Ye9WF2wAzWzsnm3blImt09Dmc/VpYN KSIBIGMpAvWt12L1QgVDIJikDGHD X-Google-Smtp-Source: APXvYqycvr73Dd4NeB0CZ2XZu+qMvETVO6eTkFJMOZU1LlcIHpwJMRnMGgJmovQxdJ0pTKP/Hl1VnQ== X-Received: by 2002:a2e:b0c4:: with SMTP id g4mr29193050ljl.155.1560956601894; Wed, 19 Jun 2019 08:03:21 -0700 (PDT) Received: from localhost.localdomain (92-100-254-33.dynamic.avangarddsl.ru. [92.100.254.33]) by smtp.googlemail.com with ESMTPSA id j90sm3130575ljb.29.2019.06.19.08.03.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jun 2019 08:03:20 -0700 (PDT) From: OvchinnikovDmitrii To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Jun 2019 18:03:07 +0300 Message-Id: <20190619150307.8712-1-ovchinnikov.dmitrii@gmail.com> X-Mailer: git-send-email 2.19.1.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] AMF: Vulkan initialization support for encoder. 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 Cc: OvchinnikovDmitrii Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Added linux support for amf encoder through vulkan. To use h.264(AMD VCE) encoder on linux amdgru-pro version 19.20+ and amf-amdgpu-pro package(amdgru-pro contains, but does not install automatically) are required. Initialization of amf encoder occurs in this order: 1) trying to initialize through dx11 2) trying to initialize through dx9 3) trying to initialize through vulkan Only Vulkan initialization available on linux. --- libavcodec/amfenc.c | 22 ++++++++++++++++++++-- libavcodec/amfenc.h | 1 + 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index 384d8efc92..5f42c2328a 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -234,6 +234,7 @@ static int amf_init_context(AVCodecContext *avctx) ctx->trace->pVtbl->SetWriterLevel(ctx->trace, FFMPEG_AMF_WRITER_ID, AMF_TRACE_TRACE); res = ctx->factory->pVtbl->CreateContext(ctx->factory, &ctx->context); + ctx->context1 = NULL; AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR_UNKNOWN, "CreateContext() failed with error %d\n", res); // If a device was passed to the encoder, try to initialise from that. @@ -311,8 +312,19 @@ static int amf_init_context(AVCodecContext *avctx) if (res == AMF_OK) { av_log(avctx, AV_LOG_VERBOSE, "AMF initialisation succeeded via D3D9.\n"); } else { - av_log(avctx, AV_LOG_ERROR, "AMF initialisation failed via D3D9: error %d.\n", res); - return AVERROR(ENOSYS); + AMFGuid guid = IID_AMFContext1(); + res = ctx->context->pVtbl->QueryInterface(ctx->context, &guid, (void**)&ctx->context1); + AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR_UNKNOWN, "CreateContext1() failed with error %d\n", res); + + res = ctx->context1->pVtbl->InitVulkan(ctx->context1, NULL); + if (res != AMF_OK) { + if (res == AMF_NOT_SUPPORTED) + av_log(avctx, AV_LOG_ERROR, "AMF via Vulkan is not supported on the given device.\n"); + else + av_log(avctx, AV_LOG_ERROR, "AMF failed to initialise on the given Vulkan device: %d.\n", res); + return AVERROR(ENOSYS); + } + av_log(avctx, AV_LOG_VERBOSE, "AMF initialisation succeeded via Vulkan.\n"); } } } @@ -373,6 +385,12 @@ int av_cold ff_amf_encode_close(AVCodecContext *avctx) ctx->context->pVtbl->Release(ctx->context); ctx->context = NULL; } + + if (ctx->context1) { + ctx->context1->pVtbl->Terminate(ctx->context1); + ctx->context1->pVtbl->Release(ctx->context1); + ctx->context1 = NULL; + } av_buffer_unref(&ctx->hw_device_ctx); av_buffer_unref(&ctx->hw_frames_ctx); diff --git a/libavcodec/amfenc.h b/libavcodec/amfenc.h index b1361842bd..9c4ea7c071 100644 --- a/libavcodec/amfenc.h +++ b/libavcodec/amfenc.h @@ -54,6 +54,7 @@ typedef struct AmfContext { amf_uint64 version; ///< version of AMF runtime AmfTraceWriter tracer; ///< AMF writer registered with AMF AMFContext *context; ///< AMF context + AMFContext1 *context1;///< AMF context1 with vulkan support //encoder AMFComponent *encoder; ///< AMF encoder object amf_bool eof; ///< flag indicating EOF happened