From patchwork Fri Apr 5 18:57:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47865 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp1157869pzd; Fri, 5 Apr 2024 11:58:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVWfPwUyxU3dc6WMpInTy1AQv59XQtFwMMengpWh542UbSUVcCIM+GTVMMmJO7cS1jnngayDpWiyea54e1d8vRaEli4F7l+mjz3Wg== X-Google-Smtp-Source: AGHT+IH6Prin8B76pqvInATWM4gMg5RA7L/hDvbdF2Rc26GgG6p9Q9VtA/hO60392qBdIVSPt7cY X-Received: by 2002:a50:d781:0:b0:56e:2bf4:fe02 with SMTP id w1-20020a50d781000000b0056e2bf4fe02mr2663843edi.11.1712343501964; Fri, 05 Apr 2024 11:58:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712343501; cv=none; d=google.com; s=arc-20160816; b=RkzAIi0fOvtVzoZ7lkdeffshg/wqzWNxy6UTHoAh8zd263Y1A5XTZy31CPtpS+hP+E vuXomYCM441RBkLzVrrNqZxuZoZpxfzSCEiT/ttIAj15jd9bchhSsNOuRBRAK/g+EYkQ j9ySwUoYEK1ARO6lEiY3NnBZAYF7tw+4v1oJlDKEhWy/6bYqaSp0+K+k9McQ8OmcbloM zTWBClsPAzMbup/T+5nQjQ4Yib1toNtSoG+fP6BnyDqmpWgipVNOgMTBez5ePzfTOosU 9sFNSBGqiGS1o/RC9fMuZ2FpbjaEl7ImrsRDIVDeZ1l5PZHCSbfWCXalEiwG0/uSRjxi 8tEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=dfckm0H2yEknQP2jIMByimyG1N2b9MtSwdekIXqhV14=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=PIGlzeFiNsQ9aBVlqYEMANLRUCeY25Goz0SXnhQwkVheRWQ93QE4Et3yUE8aTyu5li HGg1UoXbV29X6UDAaMZagchXq3rVOdnMNM7zOoNoqsY+m2+mu8bwi7CW+1iRrcRnqAt2 T/Lugyt2GJAinfiNOPZ4Lo8h9D5P0DbGPzqXO3OinOVLmPJNS6B+1nmNv+xkidgPowPA e6C6YYowoCiHZXw71OGphPSDj453sfGIXUPKLWciaSAL/axCqJEY5uWMQIa4gA5Q6Kl4 77YdhtBdVBU9Cx3vKYj0jvqiBlMicgCmSu6PtnbRw4yCDmEK8P9Lw2kfRUwSnJp7STfD X/cQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=Z+zo5gwp; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z13-20020a056402274d00b0056de9b2f1b1si1002709edd.286.2024.04.05.11.58.21; Fri, 05 Apr 2024 11:58:21 -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=@haasn.xyz header.s=mail header.b=Z+zo5gwp; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C980868D1CF; Fri, 5 Apr 2024 21:57:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 63B3B68D198 for ; Fri, 5 Apr 2024 21:57:31 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712343447; bh=NWy4vbMmSNZU+7cl0RLALU/3x7t6zQSDXODn/bT2kOQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z+zo5gwpSlb9KzCOchIXik2qyZvp6cR321+3fR8pNdV6HgPs/CgA9oUz2qGYstavj LWV3TitRRyEo6gnHfEoOf1XqkP/YPVm9Wqx3Mko2kcB5+nRzwBykT3SqS/rjd2+Qhj +ZhZMJF96YqyS0ftzfrvh675cwjdXzYR6Vi0AIRA= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id F046D42B62; Fri, 5 Apr 2024 20:57:26 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 20:57:16 +0200 Message-ID: <20240405185721.111072-6-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240405185721.111072-1-ffmpeg@haasn.xyz> References: <20240405185721.111072-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/11] avcodec/libaomenc: switch to get_supported_config() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: N4372dMvdZRc From: Niklas Haas --- libavcodec/libaomenc.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 4a71bba9c9c..899aa2b261f 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -1398,16 +1398,24 @@ static const enum AVPixelFormat av1_pix_fmts_highbd_with_gray[] = { AV_PIX_FMT_NONE }; -static av_cold void av1_init_static(FFCodec *codec) +static int av1_get_supported_config(const AVCodecContext *avctx, + const AVCodec *codec, + enum AVCodecConfig config, + unsigned flags, const void **out) { - int supports_monochrome = aom_codec_version() >= 20001; - aom_codec_caps_t codec_caps = aom_codec_get_caps(aom_codec_av1_cx()); - if (codec_caps & AOM_CODEC_CAP_HIGHBITDEPTH) - codec->p.pix_fmts = supports_monochrome ? av1_pix_fmts_highbd_with_gray : - av1_pix_fmts_highbd; - else - codec->p.pix_fmts = supports_monochrome ? av1_pix_fmts_with_gray : - av1_pix_fmts; + if (config == AV_CODEC_CONFIG_PIX_FORMAT) { + int supports_monochrome = aom_codec_version() >= 20001; + aom_codec_caps_t codec_caps = aom_codec_get_caps(aom_codec_av1_cx()); + if (codec_caps & AOM_CODEC_CAP_HIGHBITDEPTH) + *out = supports_monochrome ? av1_pix_fmts_highbd_with_gray : + av1_pix_fmts_highbd; + else + *out = supports_monochrome ? av1_pix_fmts_with_gray : + av1_pix_fmts; + return 0; + } + + return ff_default_get_supported_config(avctx, codec, config, flags, out); } static av_cold int av1_init(AVCodecContext *avctx) @@ -1528,5 +1536,5 @@ FFCodec ff_libaom_av1_encoder = { FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_AUTO_THREADS, .defaults = defaults, - .init_static_data = av1_init_static, + .get_supported_config = av1_get_supported_config, };