From patchwork Fri Apr 5 18:57:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47864 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp1157807pzd; Fri, 5 Apr 2024 11:58:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWmQY0iNCWBQtBBJwUzaccNgUWexrj+7GnqATe+6meC/BMjj/Zaru6ERERu1w/3r9zOpYVLrIOX06Po7b68tHcIsi2PExHttXAf0A== X-Google-Smtp-Source: AGHT+IE/exRhgkdHXq1vUIOv+DijaGVfB1sgDR+4o/FlZWYyhdbWL2h7UsEOvx+NN5NHsPbjpNpJ X-Received: by 2002:a50:9fe3:0:b0:56e:a76:b79a with SMTP id c90-20020a509fe3000000b0056e0a76b79amr2426475edf.7.1712343493771; Fri, 05 Apr 2024 11:58:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712343493; cv=none; d=google.com; s=arc-20160816; b=o1fgeicdHqUF0JFgJjEevJNmSM7BBWpTmKgD27Ysdy2q0GFgdpTsilIZ69yS1dJ9h1 mmzJl2ccVROqGwQNWY2LupkIJr/vqcFMI/NgdWelbXhFiYExumT9EW/Ylx8q9RyHfD9b AWh2ViURTpK4E21xNASxBLRQ62oZcg14v7AR56s84iGOttndqBvgEOdLVKLukGeudHKo KzDHZ4MIMwSo/81hJESuMztew79kI33mtjlOoDEa78aAzBoMQ1dG+RsJQh5o+CzzEsLe hKOKnQmHMvJvLsSjLrx8Dx8CFqS7z/MGSNDBXIJ26Mm5rsOJmr7W7DsWpUgxpLhnRwHn Zhzg== 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=dle471v9IGswlm3c8P0mGbbcfG3wD5wxbnUtv43nK6g=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=wS4piOjbyBZfMIbELDKVZ4CqoVL7mQ4vrU3HOpUp67XXVyyILtN+Fk1PeUuTIvpTKk bDdppWS//PQOpaSnHKcCCVY7565oR/0GibL1dPq7HJU51jrDiBQwIpgGB4TokXaCt2DB OSEviaAPAuWY8dGKKlRaide66NXP1t49pE5tZgTjfdWqqKay5+HROKXLRspXxVAysCNM 41bZ+HrsJJL3Pr6qVf6ehtB55+Oi9Wjx7fb8yro4hEArYQJbdCZG3YNwGZ419i5KrkSd P7q66yEf3nGkFVAkNsOaOohuFXBd9mgLOXv8MwLDH0hAcmIj8ToQlMh7amr+3MBycPdD ucgw==; 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=JTWyH6fU; 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 b64-20020a509f46000000b0056c07b5c8ccsi994352edf.318.2024.04.05.11.58.13; Fri, 05 Apr 2024 11:58:13 -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=JTWyH6fU; 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 A75E268D1CA; Fri, 5 Apr 2024 21:57:37 +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 F382468D095 for ; Fri, 5 Apr 2024 21:57:26 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712343446; bh=i4h1F8Czw22Scr6ZNQH/gBGQ4wBb6lIZkvkQ76CeEzc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JTWyH6fUEv2+j8L/CMDdQvP4R8TEoyG7eWviC6Xx+seFRYTjCWsmQ2KGHKhqj1P8T Fs3sRly/GzXL+Q70mDI2ecqPopF6TlTFERpcS/4OMKRwqhiKi2EUsfFWe2TVuUn4eM u7C3Y4y1SSU9mVbRV5QGCi3QBwh41Adqr0RfHuuw= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id BB4FA42A98; Fri, 5 Apr 2024 20:57:26 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 20:57:15 +0200 Message-ID: <20240405185721.111072-5-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 05/11] avcodec/libvpxenc: 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: Le0onJV2OSW8 From: Niklas Haas --- libavcodec/libvpxenc.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index bcbdc4981e5..ac7f01e2aa9 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -2086,13 +2086,21 @@ static const enum AVPixelFormat vp9_pix_fmts_highbd[] = { AV_PIX_FMT_NONE }; -static av_cold void vp9_init_static(FFCodec *codec) +static int vp9_get_supported_config(const AVCodecContext *avctx, + const AVCodec *codec, + enum AVCodecConfig config, + unsigned flags, const void **out) { - vpx_codec_caps_t codec_caps = vpx_codec_get_caps(vpx_codec_vp9_cx()); - if (codec_caps & VPX_CODEC_CAP_HIGHBITDEPTH) - codec->p.pix_fmts = vp9_pix_fmts_highbd; - else - codec->p.pix_fmts = vp9_pix_fmts_highcol; + if (config == AV_CODEC_CONFIG_PIX_FORMAT) { + vpx_codec_caps_t codec_caps = vpx_codec_get_caps(vpx_codec_vp9_cx()); + if (codec_caps & VPX_CODEC_CAP_HIGHBITDEPTH) + *out = vp9_pix_fmts_highbd; + else + *out = vp9_pix_fmts_highcol; + return 0; + } + + return ff_default_get_supported_config(avctx, codec, config, flags, out); } static const AVClass class_vp9 = { @@ -2120,6 +2128,6 @@ FFCodec ff_libvpx_vp9_encoder = { .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | FF_CODEC_CAP_AUTO_THREADS, .defaults = defaults, - .init_static_data = vp9_init_static, + .get_supported_config = vp9_get_supported_config, }; #endif /* CONFIG_LIBVPX_VP9_ENCODER */