From patchwork Thu Oct 15 00:16:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitrii Ovchinnikov X-Patchwork-Id: 22961 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 E7A7E44A83F for ; Thu, 15 Oct 2020 03:22:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CB42C68BB03; Thu, 15 Oct 2020 03:22:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9941368BAEB for ; Thu, 15 Oct 2020 03:22:15 +0300 (EEST) Received: by mail-lj1-f177.google.com with SMTP id m20so1310212ljj.5 for ; Wed, 14 Oct 2020 17:22:15 -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=RFCN3+CyEuWVJ7nk1t1w/mh0VoNDBUWHDBJZVigIynw=; b=KDS+Xt9eyz9NOY0YEnjCrOali98iyXUqdjrNyajq1vGjSFfsDS+VEdJARIfIG2Y55Y JrtW+2QcMi64rzRscRaR8AiPxsxxoPiRBRB4kY7gVO90Q2cwm15Acpayocfk+A0yO6RC EGjvOHPXAy0TVRmMhli13CIFpZ8p0Ck8lg7bIfvBZIQeVJ8QQTdaJtXyHwajkJ6vdjYy v9ujhdg47tD1eEVPqb3IkmMUb83lQ42RB+3Un9jvMCI0lC6f6tqWx2RcAzivu5vVCZGt Yu6zefwL3sEdC8GikpnC/L6lp7FoWHOLDiYIW76qRtpORpbbDEtu7oA90/5oPFuipBu3 of/w== 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=RFCN3+CyEuWVJ7nk1t1w/mh0VoNDBUWHDBJZVigIynw=; b=UkXmIMBnckl/+s8CejVGh9t/q0/DuQ4lBYG/QYykjwoH0Rx1pzrG84lzmn4OqeTGN9 JzzDh4uTgHmEXmJ2NgMw+TVZ7GzaFN7DAW7lf08WA4QTiJmqlCQFMJJB02ufQZ9fm4xr tZyv3s6nHdjLefvAw4bO0tPhuP1hDOpW9Tz/rsUiWJ8XBjoe0G5WH2CH3/X3QWG6UW08 jr5YueThHtRIs/6dN9IKQg7SbuCgqhkW06nUANgoYL5TN18rFwxRWRug9mmOPFApQFC/ 0rYEWCOfJgF/TrBv9ke0N3SDmI19/qqSR90wrXJ7uu8p0mk0qWLBkns8hVMJVk6kT4rQ rl0g== X-Gm-Message-State: AOAM531d+V/fvgyqr44E3pU+Kg6+K25CBs1dernMq99Gon1twQ422/zU wfEMBZ1hPZ88TZH//3LHixF2muOe1i085Q== X-Google-Smtp-Source: ABdhPJzZxpZyACWjSUVzVyl8ojM01RET2bCXqYf2SvNHsyAxk1uFFDHomdml93kMOM6r3fcCMVf13g== X-Received: by 2002:a2e:834f:: with SMTP id l15mr224007ljh.112.1602720998766; Wed, 14 Oct 2020 17:16:38 -0700 (PDT) Received: from localhost.localdomain (95-55-4-47.dynamic.avangarddsl.ru. [95.55.4.47]) by smtp.googlemail.com with ESMTPSA id q20sm333291lfp.43.2020.10.14.17.16.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Oct 2020 17:16:38 -0700 (PDT) From: OvchinnikovDmitrii To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Oct 2020 03:16:21 +0300 Message-Id: <20201015001625.32832-1-ovchinnikov.dmitrii@gmail.com> X-Mailer: git-send-email 2.19.1.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] lavc/amfenc: HWConfig for amf 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" --- libavcodec/amfenc.c | 12 ++++++++++++ libavcodec/amfenc.h | 4 +++- libavcodec/amfenc_h264.c | 1 + libavcodec/amfenc_hevc.c | 1 + 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index da0652943d..33f97dd582 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -782,3 +782,15 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) } return ret; } + +const AVCodecHWConfigInternal *ff_amfenc_hw_configs[] = { +#if CONFIG_D3D11VA + HW_CONFIG_ENCODER_FRAMES(D3D11, D3D11VA), + HW_CONFIG_ENCODER_DEVICE(NONE, D3D11VA), +#endif +#if CONFIG_DXVA2 + HW_CONFIG_ENCODER_FRAMES(DXVA2_VLD, DXVA2), + HW_CONFIG_ENCODER_DEVICE(NONE, DXVA2), +#endif + NULL, +}; \ No newline at end of file diff --git a/libavcodec/amfenc.h b/libavcodec/amfenc.h index 80658c6b2a..06994da543 100644 --- a/libavcodec/amfenc.h +++ b/libavcodec/amfenc.h @@ -27,7 +27,7 @@ #include "libavutil/fifo.h" #include "avcodec.h" - +#include "hwconfig.h" /** * AMF trace writer callback class @@ -117,6 +117,8 @@ typedef struct AmfContext { int tier; } AmfContext; +extern const AVCodecHWConfigInternal *ff_amfenc_hw_configs[]; + /** * Common encoder initization function */ diff --git a/libavcodec/amfenc_h264.c b/libavcodec/amfenc_h264.c index 7a8029f3b7..622ee85946 100644 --- a/libavcodec/amfenc_h264.c +++ b/libavcodec/amfenc_h264.c @@ -392,4 +392,5 @@ AVCodec ff_h264_amf_encoder = { .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .pix_fmts = ff_amf_pix_fmts, .wrapper_name = "amf", + .hw_configs = ff_amfenc_hw_configs, }; diff --git a/libavcodec/amfenc_hevc.c b/libavcodec/amfenc_hevc.c index fa12a3a3f6..bb224c5fec 100644 --- a/libavcodec/amfenc_hevc.c +++ b/libavcodec/amfenc_hevc.c @@ -322,4 +322,5 @@ AVCodec ff_hevc_amf_encoder = { .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .pix_fmts = ff_amf_pix_fmts, .wrapper_name = "amf", + .hw_configs = ff_amfenc_hw_configs, };