From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 189034C0B6 for ; Wed, 5 Feb 2025 16:07:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CB11068B887; Wed, 5 Feb 2025 18:07:29 +0200 (EET) Received: from out203-205-221-221.mail.qq.com (out203-205-221-221.mail.qq.com [203.205.221.221]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A6BDD68B510 for ; Wed, 5 Feb 2025 18:07:22 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1738771633; bh=UP3nbE9b71HsGisK53ecIRwD3cndslwheF5HmfEExAo=; h=From:To:Cc:Subject:Date; b=QhYfxBC0OK9hLJJiaXic15rJKvY+8Vc/cr9f1rpviGmVniSRCGm5SsXEFeYn8g3N/ LamSBFXaK5uH6naOZ/ZvjobcSjGBpj2Pz847YBw6RTHet481eLUHu4KV93wa1Miyf2 NQSZNlGX236oh9vwmzAvjnvu0nTfSxVIRCixXaz4= Received: from ZHILIZHAO-MB1.tencent.com ([240e:3b7:3277:36f0:544a:7de:c82a:2aa2]) by newxmesmtplogicsvrszc11-0.qq.com (NewEsmtp) with SMTP id 1CCAC8B2; Thu, 06 Feb 2025 00:07:12 +0800 X-QQ-mid: xmsmtpt1738771632trigg72wx Message-ID: X-QQ-XMAILINFO: MSPab3JKqisN9E8IXB19xCDgokCR3nquMREijuF5epe0ReD/W4NlKErS0s3AYE fOajFybCFyiyxrCVMxe6ImT2O/a55XumaAwOZ94KW27U8TE/qW5TM9kq8wWcC3/vxwKKNGsz4FKN u9IWIW0Xs5ao1QjpsiOPbI/KpOeDapxPggBUOJDYlFlXpWATaRAyH/LkjKGG7qtMbetPyCTFajZI cA7cEFzPOgvPD0sfC4YtLJ7MhsArD2cszWSkE0epHXCzFChfOnma2XU7r3rpa4smHEbTtlDsWqVj N2u2yIFeApfG6QKLEpIyU1nca1ymqmhYpu7jXB3ZXNCEXFwKBtpa/yKJxt8G+UiKjFGOBAVSlDsS tsVc/rWQGSNlCtO8+vueLwfLSeR7DNtJ+J3DP8JwK2rcstGfILMq+xIEqTg1K7cHkZJQ3neMl3+3 v5rotfejjhULt+RIcMGJtFbcG+azNQDk4yylRJXMgtxqQkuu7EEh7C7Gdo+iSetgwOfvj11zkZDc p7AEz+tqHuFcazonVrvpahIBG94Kyc/76WkRGjws7c9IZiDsubCDEpQazP/R1NtV+ugosd6qfzc9 kOzivwgv4AaDA1WZ9wyjSFwwSzmlzo2Hxau54+ODNRC4FGNAPxNhMCuX4Gv7WW89ZbEc1qho1guo NlDtcFoVw/s4rTZrK4NIZhOzd6UenI5ZoWtf8lU0OjJ/6Epw6fFV+5HJkEV7Jo7NNaIErI3uqqdg 9Lmg9yjwUZdV37+8WUdxfYjMxDD+2dbDBrf3p966HKj8EnKyqTUKBjzyr37GTFBSC3HFeYbJCcF4 TG2wjobCrai5mkMotcxgdz90dxzPOHgcHWL7GTOFsyZjaSnDAvqYMWoBBkc2jVlEER4d6WuwzN07 wl9eksixkfOIOsjnaAOAXgXg6FWi5bulX/QR5v3nnbHTYWqIUMBE4zM8fJ4zDmYiqE5by4uQgaae vNYgHaj1Xr2rstSCelgw7cp3IZzvinBDzhYhKGrPmIeahNVtzbSG71lFOqINrP X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Feb 2025 00:07:11 +0800 X-OQ-MSGID: <20250205160711.96654-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libx264: Fix deprecation warnings on pix_fmts 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: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Zhao Zhili --- libavcodec/allcodecs.c | 6 ++--- libavcodec/libx264.c | 53 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 50 insertions(+), 9 deletions(-) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 4e1b1c9b45..d2ec4c3045 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -811,9 +811,9 @@ extern const FFCodec ff_libvvenc_encoder; /* preferred over libwebp */ extern const FFCodec ff_libwebp_anim_encoder; extern const FFCodec ff_libwebp_encoder; -extern const FFCodec ff_libx262_encoder; -extern const FFCodec ff_libx264_encoder; -extern const FFCodec ff_libx264rgb_encoder; +extern FFCodec ff_libx262_encoder; +extern FFCodec ff_libx264_encoder; +extern FFCodec ff_libx264rgb_encoder; extern FFCodec ff_libx265_encoder; extern const FFCodec ff_libxeve_encoder; extern const FFCodec ff_libxevd_decoder; diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 409f45fc7d..c4bc7c48f5 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -1607,6 +1607,12 @@ static const FFCodecDefault x264_defaults[] = { { NULL }, }; +static int X264_get_supported_config(const AVCodecContext *avctx, + const AVCodec *codec, + enum AVCodecConfig config, + unsigned flags, const void **out, + int *out_num); + #if CONFIG_LIBX264_ENCODER static const AVClass x264_class = { .class_name = "libx264", @@ -1615,7 +1621,7 @@ static const AVClass x264_class = { .version = LIBAVUTIL_VERSION_INT, }; -const FFCodec ff_libx264_encoder = { +FFCodec ff_libx264_encoder = { .p.name = "libx264", CODEC_LONG_NAME("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), .p.type = AVMEDIA_TYPE_VIDEO, @@ -1633,13 +1639,13 @@ const FFCodec ff_libx264_encoder = { .flush = X264_flush, .close = X264_close, .defaults = x264_defaults, - .p.pix_fmts = pix_fmts_all, .color_ranges = AVCOL_RANGE_MPEG | AVCOL_RANGE_JPEG, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_AUTO_THREADS #if X264_BUILD < 158 | FF_CODEC_CAP_NOT_INIT_THREADSAFE #endif , + .get_supported_config = X264_get_supported_config, }; #endif @@ -1651,7 +1657,7 @@ static const AVClass rgbclass = { .version = LIBAVUTIL_VERSION_INT, }; -const FFCodec ff_libx264rgb_encoder = { +FFCodec ff_libx264rgb_encoder = { .p.name = "libx264rgb", CODEC_LONG_NAME("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 RGB"), .p.type = AVMEDIA_TYPE_VIDEO, @@ -1659,7 +1665,6 @@ const FFCodec ff_libx264rgb_encoder = { .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, - .p.pix_fmts = pix_fmts_8bit_rgb, .p.priv_class = &rgbclass, .p.wrapper_name = "libx264", .priv_data_size = sizeof(X264Context), @@ -1672,6 +1677,7 @@ const FFCodec ff_libx264rgb_encoder = { | FF_CODEC_CAP_NOT_INIT_THREADSAFE #endif , + .get_supported_config = X264_get_supported_config, }; #endif @@ -1683,7 +1689,7 @@ static const AVClass X262_class = { .version = LIBAVUTIL_VERSION_INT, }; -const FFCodec ff_libx262_encoder = { +FFCodec ff_libx262_encoder = { .p.name = "libx262", CODEC_LONG_NAME("libx262 MPEG2VIDEO"), .p.type = AVMEDIA_TYPE_VIDEO, @@ -1691,7 +1697,6 @@ const FFCodec ff_libx262_encoder = { .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, - .p.pix_fmts = pix_fmts_8bit, .color_ranges = AVCOL_RANGE_MPEG, .p.priv_class = &X262_class, .p.wrapper_name = "libx264", @@ -1702,5 +1707,41 @@ const FFCodec ff_libx262_encoder = { .defaults = x264_defaults, .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_AUTO_THREADS, + .get_supported_config = X264_get_supported_config, }; #endif + +static int X264_get_supported_config(const AVCodecContext *avctx, + const AVCodec *codec, + enum AVCodecConfig config, + unsigned flags, const void **out, + int *out_num) +{ + if (config == AV_CODEC_CONFIG_PIX_FORMAT) { +#if CONFIG_LIBX264_ENCODER + if (codec == &ff_libx264_encoder.p) { + *out = pix_fmts_all; + *out_num = FF_ARRAY_ELEMS(pix_fmts_all) - 1; + return 0; + } +#endif + +#if CONFIG_LIBX264RGB_ENCODER + if (codec == &ff_libx264rgb_encoder.p) { + *out = pix_fmts_8bit_rgb; + *out_num = FF_ARRAY_ELEMS(pix_fmts_8bit_rgb) - 1; + return 0; + } +#endif +#if CONFIG_LIBX262_ENCODER + if (codec == &ff_libx262_encoder.p) { + *out = pix_fmts_8bit; + *out_num = FF_ARRAY_ELEMS(pix_fmts_8bit) - 1; + } +#endif + return AVERROR(EINVAL); + } + + return ff_default_get_supported_config(avctx, codec, config, flags, out, + out_num); +} -- 2.46.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".