From patchwork Mon Apr 8 12:57:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47923 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp2456718pzd; Mon, 8 Apr 2024 06:02:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWfizhx8Cyl3P8ES7hb2XBI2hI5ixiyC45gzrWDeHxGc7ahUxk0JNvmhoYn0+AyNNy7oFIfI4X/yMYmsnv6Gtc7dvU9Wjg8r5V7aA== X-Google-Smtp-Source: AGHT+IGVz6yueBl1+dMeD4Ldh1ivM1WEdaYqdQxLbgjOMVE1yQNphBEIfgFN8ApPcTeKKNgZNRxe X-Received: by 2002:a50:d784:0:b0:56b:9f35:65f9 with SMTP id w4-20020a50d784000000b0056b9f3565f9mr7330886edi.0.1712581327879; Mon, 08 Apr 2024 06:02:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712581327; cv=none; d=google.com; s=arc-20160816; b=knoivVImrzd36E5ZASeGYisXZv4A3vKimdPOaCETcnAHfyAHdVRu5cfic1OfgnScbu iSQkdnfW26G/Z8neAbtDqasrtqDUgYLXA3pDX1q0CIcReSbdZARHqD/igc2jGZN7XAZT 3qn+sFaUNiMh4AaORWelKoJcGFj19L0akxNYhfjIHzpguHLIm+RfCeb+EDaYGEXRtMos OqiE9kEq+mtzty9tv7zcoeJ1dMruzOPQK7VBuFZWYRNUSBA7Jhhjch0NZwGVooxUEumJ FyicxZ7FX6Wn/RIdPp5c6CddWi9mzapZZDsZKBHYfEbA3rWkzYFEYP+4cfosP3HFpd+Z xAcw== 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=WGx39s+EQgOfx9r4p8sFyQuhTXIP/iTfb5exMgAw6cI=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=aNZzcDcP6RYq8Z2RH+d4m8Y6i6L4Zo0Ap3qgWZGbCkfgrz5nQHgwVatGSKKRlFVi47 hjmjufP8WxWBWm2XVC5S53eV5uhZ3SG3SqTwTeYNijPEa8B0V7jjGQ6YfI6mJxZqQ8f2 HUtOhD45CjZDtmlO8TuTxjHIvDj3cdFi7xT8x35I52C9kvDhB7F+kSwwmGRHk4EQRcM7 qDWO2fURgle0z4gI86vSLuy0o4TvxEnUh1t3yu6/o1ckOfYu2mhZdqptPArtwqoQwD5H TZuVsrl4t75Z4RSnvv7gfev6kBpeTOKFV2SdajBVbyYJiHbDZqYsgNJjaLThaqgGpXYr bIjQ==; 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=VUDPQhn0; 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 u26-20020a50d51a000000b0056c3c5dfca7si3673376edi.21.2024.04.08.06.02.07; Mon, 08 Apr 2024 06:02:07 -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=VUDPQhn0; 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 9F62968D2E6; Mon, 8 Apr 2024 16:00:11 +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 0E42B68D240 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=1712581193; bh=+lICPwiAl7UATWCSFFOfYHQ3NE/QVT8DDYgWWu6L2gk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VUDPQhn0kqJOxi+/NemZN+pfJfgcWtyKilvVzFRbcVKMX7mtsKB3nZCJKMwtZEAc1 DCMIhvJUhf2SIbTT/adZyak2vJtTYC6zqtzakZfGtxt1Oo6tuwn+do/XfIwtvS/KHn InQnMry+RuS6sQL73iXZq6HZz+O0T3t1n81Hf2rQ= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 8762C4344E; Mon, 8 Apr 2024 14:59:53 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Apr 2024 14:57:09 +0200 Message-ID: <20240408125950.53472-6-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 05/17] avcodec/libx265: 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: i7Zo29Cll1La From: Niklas Haas --- libavcodec/libx265.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 3533ac5cc1f..e36a1eb9505 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -892,14 +892,24 @@ static const enum AVPixelFormat x265_csp_twelve[] = { AV_PIX_FMT_NONE }; -static av_cold void libx265_encode_init_csp(FFCodec *codec) +static int libx265_get_supported_config(const AVCodecContext *avctx, + const AVCodec *codec, + enum AVCodecConfig config, + unsigned flags, const void **out) { - if (x265_api_get(12)) - codec->p.pix_fmts = x265_csp_twelve; - else if (x265_api_get(10)) - codec->p.pix_fmts = x265_csp_ten; - else if (x265_api_get(8)) - codec->p.pix_fmts = x265_csp_eight; + if (config == AV_CODEC_CONFIG_PIX_FORMAT) { + if (x265_api_get(12)) + *out = x265_csp_twelve; + else if (x265_api_get(10)) + *out = x265_csp_ten; + else if (x265_api_get(8)) + *out = x265_csp_eight; + else + return AVERROR_EXTERNAL; + return 0; + } + + return ff_default_get_supported_config(avctx, codec, config, flags, out); } #define OFFSET(x) offsetof(libx265Context, x) @@ -952,7 +962,7 @@ FFCodec ff_libx265_encoder = { .p.priv_class = &class, .p.wrapper_name = "libx265", .init = libx265_encode_init, - .init_static_data = libx265_encode_init_csp, + .get_supported_config = libx265_get_supported_config, FF_CODEC_ENCODE_CB(libx265_encode_frame), .close = libx265_encode_close, .priv_data_size = sizeof(libx265Context),