From patchwork Mon Apr 8 12:57:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47925 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp2457036pzd; Mon, 8 Apr 2024 06:02:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU5aPyPUXRaxaYXpQxSew0l9Q63uVurzQNlz14jEZuXE/ayGCvIZlSkTaKjplBodxec94fVTBIegjqaysqgXfiCbaoT1JHdMj4FBA== X-Google-Smtp-Source: AGHT+IEwxa3Nv4VI+T5RH2qZwqbkanlAKUo6jDzBWrYqxaffN1Sn2iy6Ovv2TEK+KkitFAoggUR5 X-Received: by 2002:a50:d518:0:b0:56d:fca8:d2d6 with SMTP id u24-20020a50d518000000b0056dfca8d2d6mr7516514edi.6.1712581349657; Mon, 08 Apr 2024 06:02:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712581349; cv=none; d=google.com; s=arc-20160816; b=K4tDJahmQOrfCZdvAEhgcoSoNqLd5YIG7xVc0NwlXJirz2QPN3WLUPHfaYBjfl3MU4 CuAqdMvedXn33zyKILthDIiX0oL07nKiYVk0LOqI1XPc7atpsSDzhYZUuIkgC2jrr4WG fFFmlVdXz6gq5pQUOcN0ydjkBKZNflaUfv38HGu/2xXxgxa9fHjhl1z5iSCdrk7d29GC 33QdBiHxLC8KdFNucTNs+MWwdd6N1f3CsujKhAiTDMJd1EOTSLn82MeMPWtLqLrWiBvJ kK2TyoPbXRnHqxoVcWcGKo5fTUQwXdEuIar04NC8aobuo3SFdBmujrL9rvyJTdtQ4gt4 KNcA== 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=FhFLYZKJNPeiFJqs7vwHAyV7ot08GAlah+o3BThGI9o=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=q0pOSfAFHktHxKTyB81K7Xvt9rXqMKKUYhtox6/0bpuj3YL3MbnTiAAqMtIZUGxbZQ JVWAC2g4ifqgNpPNX/qxkNz+UoZMBtTbP+IALpIRL+o6VFfp5WFiz3LG44aCfz8UVioZ T+siA/d38jeacRunG1ZAcrAxs3G0mXs5llKubxtwtQMqE2Qk+GBCqkEjX+/0R1yvp1Re cQkxI7UXZamsgLB+1Y1Di85osebzmV51uoMMo+A14UVOzPb2aFw7AEBk791au42Nez/t 1NfXh1GiiUymkO4D/rdS1NWonDdl+SdNiFY5d05A7rU3u5mzAcuBmzav1Vj+lOq0BI+j Sxhw==; 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=CijgfTAl; 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 t17-20020a50ab51000000b0056e0bad0380si3531911edc.11.2024.04.08.06.02.28; Mon, 08 Apr 2024 06:02:29 -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=CijgfTAl; 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 9A60D68D1D2; Mon, 8 Apr 2024 16:00:13 +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 3E4AA68D247 for ; Mon, 8 Apr 2024 15:59:58 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712581194; bh=HkDvjrtRNqX01zYOO2Hqr5OPSKntVuFM7y/NaZ0ryEI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CijgfTAl7j57sSirtWh6npu++i6tZCb4tVS9bZ8Ku9M96wiY+Oet4oqp5E8P93TpA kjVDjEWpp/wnEVklQABWASOuzbUJOVaO8J9rbt4p+mSeF/qNbhs18PClJ1JAEZ85p5 vKdzWKBOY7rS3tqz2s4roiIBuIt2TYcQqN9z92V0= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id EFC62444D6; Mon, 8 Apr 2024 14:59:53 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Apr 2024 14:57:11 +0200 Message-ID: <20240408125950.53472-8-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408125950.53472-1-ffmpeg@haasn.xyz> References: <20240408125950.53472-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 07/17] 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: rFHBYbyiUiAs 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 5023d2fda42..0488e5c3c9a 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) @@ -1529,5 +1537,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, };