From patchwork Mon Apr 13 15:33:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 18919 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 4CCDE449F3D for ; Mon, 13 Apr 2020 18:33:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3605768B955; Mon, 13 Apr 2020 18:33:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 724CB68B6DA for ; Mon, 13 Apr 2020 18:33:29 +0300 (EEST) Received: by mail-wm1-f54.google.com with SMTP id e26so9691531wmk.5 for ; Mon, 13 Apr 2020 08:33:29 -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:mime-version :content-transfer-encoding; bh=JLM0M2/iM5IvBKksk3tv4/9fMZNZ9CPXIF7Se3ZZSBo=; b=TGP4h6LRO7MXdw38snmQnhJQZPvwoKs4cMrzi44GWf83p7jkPqliLFDbGgBkejdu9E 3EEiCDXHkV7CmggNqsRP2Sp5wZnER7UR5OLEDIBUp5cVwWq1tIoUEtQky0nhoGY2L9xo mObRfNorwDF4hVnww3RqAvu6MPoC5jDLS154dNN2TTfEaR5FRMCUHOsz5/qGfpgNjewp NDq1bJigMAru9S2+KfdUgZ1E2LZPOidKV3cfsbUkH4qyd/OskzOalk3KfO68vIg6Q5v2 nEZyOtCaPJYy9gzN9scgrBXJAXOoCbezb4hojEHiHQCJpDhB0cleyYCfRmNBxrFC0jHo SPIg== 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:mime-version:content-transfer-encoding; bh=JLM0M2/iM5IvBKksk3tv4/9fMZNZ9CPXIF7Se3ZZSBo=; b=nqGFP8yR2Eomc4HiHpJA9Id4e2YbElUXCitFPjHduAjc0v4ATszcxp2LEBnih2E6g2 0nxTCcjn0ESAlaErdFgn94yFQn7Y6cNaoVuRJBRYvDc6jaJOQyH7950OoHPqrXEaZ0r1 skuQ0HVDkDj11SRTqhJqjezCJ4ijvWeEwX+f3w0TzrEf5MQnGeftUrFrjU+Qw4EfX0H+ F8P3/N9oJYCiX0q9ikGeTu45DykAzP3dRbw0brhJCmZlgJI1Lcf9q2JGj5ZLN1QyGziU y7F0CmUjJP2BkJbamfG8mW5OQFjpRI3weaxQDOWSWIhe/6IgQt4GMffT308voVpebN+B w15w== X-Gm-Message-State: AGi0PuYuUmjmxrzVpjkiGxWTgQUhxlIAwZGlRbZHDY9yz9zjr7vYc0ik cHoNtsa3RhftiFRU31j9lgLyTYJV7n0= X-Google-Smtp-Source: APiQypJA9r54wRdzeiPj6ypDPyrt941wM+qUAqlebHhhon481e/dIr+eHzQCpDdmhezYjZ20T1Blew== X-Received: by 2002:a1c:8141:: with SMTP id c62mr18977313wmd.87.1586792008191; Mon, 13 Apr 2020 08:33:28 -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 t8sm15157557wrq.88.2020.04.13.08.33.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2020 08:33:27 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Apr 2020 16:33:15 +0100 Message-Id: <20200413153321.5956-2-sw@jkqxz.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200413153321.5956-1-sw@jkqxz.net> References: <20200413153321.5956-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/8] lavc: Extend hardware config metadata to encoders 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" --- libavcodec/avcodec.h | 11 ++++++++++- libavcodec/hwconfig.h | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 55151a0b71..136292fee7 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2534,6 +2534,10 @@ enum { * AVCodecContext.hw_frames_ctx should be set to a suitable frames * context inside the get_format() callback. The frames context * must have been created on a device of the specified type. + * + * When selecting this format for an encoder, + * AVCodecContext.hw_frames_ctx should be set to the context which + * will be used for the input frames before calling avcodec_open2(). */ AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX = 0x02, /** @@ -2556,7 +2560,12 @@ enum { typedef struct AVCodecHWConfig { /** - * A hardware pixel format which the codec can use. + * For decoders, a hardware pixel format which that decoder may be + * able to decode to if suitable hardware is available. + * + * For encoders, a pixel format which the encoder may be able to + * accept. If set to AV_PIX_FMT_NONE, this applies to all pixel + * formats supported by the codec. */ enum AVPixelFormat pix_fmt; /** diff --git a/libavcodec/hwconfig.h b/libavcodec/hwconfig.h index 4199ffdd50..f421dc909f 100644 --- a/libavcodec/hwconfig.h +++ b/libavcodec/hwconfig.h @@ -81,4 +81,22 @@ typedef struct AVCodecHWConfigInternal { #define HWACCEL_XVMC(codec) \ HW_CONFIG_HWACCEL(0, 0, 1, XVMC, NONE, ff_ ## codec ## _xvmc_hwaccel) +#define HW_CONFIG_ENCODER(device, frames, ad_hoc, format, device_type_) \ + &(const AVCodecHWConfigInternal) { \ + .public = { \ + .pix_fmt = AV_PIX_FMT_ ## format, \ + .methods = (device ? AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX : 0) | \ + (frames ? AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX : 0) | \ + (ad_hoc ? AV_CODEC_HW_CONFIG_METHOD_AD_HOC : 0), \ + .device_type = AV_HWDEVICE_TYPE_ ## device_type_, \ + }, \ + .hwaccel = NULL, \ + } + +#define HW_CONFIG_ENCODER_DEVICE(format, device_type_) \ + HW_CONFIG_ENCODER(1, 0, 0, format, device_type_) + +#define HW_CONFIG_ENCODER_FRAMES(format, device_type_) \ + HW_CONFIG_ENCODER(0, 1, 0, format, device_type_) + #endif /* AVCODEC_HWCONFIG_H */