From patchwork Wed Oct 14 23:45:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitrii Ovchinnikov X-Patchwork-Id: 22957 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 6B78544A6B0 for ; Thu, 15 Oct 2020 02:52:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4228768B90F; Thu, 15 Oct 2020 02:52:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f66.google.com (mail-lf1-f66.google.com [209.85.167.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B1BDC68B75D for ; Thu, 15 Oct 2020 02:52:48 +0300 (EEST) Received: by mail-lf1-f66.google.com with SMTP id c141so1430089lfg.5 for ; Wed, 14 Oct 2020 16:52:48 -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=RgAndTidTKxgWDqVzVpTTp1ktUWPFmJf4+48MPjsXtJC1nSfANTgwYd1FGmCVCGZqx ebQRJaC7dAKVsfIYOJiu/eCQxSTUgON2McvAsaYo03jWn9Ods8/X/7+WJnjoONsfjgMz R7IDXbSVKraKXhZjLTzZ8J9EbHbB6NO/iOjGiB8fiOIWRmWSoJyPV14KDrbgepzCKVUA tp4vcDL7/YIruklrgNRW8AFA/vnhsA/xdCh77j3yMpjt9OGoyHQK9AAWxVRF1zslEisd Rxqjnh2N6+EnQT8qhBtpHbRnyb8V4mlcvpwA8TBXGe7x1mFqHSVK2ojZZl40G+IyPrAT 0V4Q== 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=MTt7WDipVvAS9AsrsQwyHCW/2TLjU5y1g4/D13g5rHLwofNqDdCciA4qmWZ/weI3pf L3BtuOvHX+h67RoUz7xRiFA4FE+PvTF2P37DamvKP8tNfCDmjthpmvJn4Nbt8wIGJ6kV oA1U5XU5U9KjGMcMVShYpl3mjr0S65QvcgWAUJgrfArqoPATZsfOyIquEhMSg0hC4IxJ OKiViAIAtKEp9js20k3l3qDujDiujzE4YwfSPtaBwUXEJpzrbxdQy7yu5j4uWEgOiVFt JYhEHPenalRw/Ni85ZQ+UIjC0PX/gJ7AECAnvSCcHps+Qqh3YH72izXlWxKnm58rK2At GgRw== X-Gm-Message-State: AOAM531IUFvNP4ouVeMddu/SsQY+qiIvQOiTAZLLkzVipYqooZgGdOO6 03IldflQgcyYaMbAWk/QhRt00cS8x1oEHQ== X-Google-Smtp-Source: ABdhPJwT+AYN9S/bb922gtiXYrg3ezfrJud4ynQ/wxTByWSGkS8/ivw/6Y+tIsgAmXlKxQixwoYEhg== X-Received: by 2002:ac2:55a5:: with SMTP id y5mr149428lfg.473.1602719135042; Wed, 14 Oct 2020 16:45:35 -0700 (PDT) Received: from localhost.localdomain (95-55-4-47.dynamic.avangarddsl.ru. [95.55.4.47]) by smtp.googlemail.com with ESMTPSA id m5sm297390lfc.306.2020.10.14.16.45.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Oct 2020 16:45:34 -0700 (PDT) From: OvchinnikovDmitrii To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Oct 2020 02:45:08 +0300 Message-Id: <20201014234508.2704-1-ovchinnikov.dmitrii@gmail.com> X-Mailer: git-send-email 2.19.1.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] 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, };