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 ESMTP id 01F554A13B for ; Fri, 22 Mar 2024 13:33:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3A88668D596; Fri, 22 Mar 2024 15:33:07 +0200 (EET) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2036.outbound.protection.outlook.com [40.92.66.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 02FD068D484 for ; Fri, 22 Mar 2024 15:33:00 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cs6KE7uDynSL9+AXF39MKqqxwcW3rpMT0se/pIFVH4FD7YrzyWt4mYcBJJro8oMe6GHa88Yri0f/lZzfiRk4mXZpdbC2yMCwqTq9R1Uj82CATf/aKYSTsm1ceBx/zmvU0oudPC9PV7eGnxrWsuXt7hn0yMP8WPgPOOLMKq8X8VQHIRUddVfVGIaobitxK3qjqaD199i/iG6KmMoWz+l1h6UoGWqxaMExJMGMRI1ZhlZ/aj9k8HnvJkPaRYqz59Cw4TlwgK6qyChuc8ZP8TKlts1/x4Y5txFRyWTCIvROqkEcA2iCtf/+gb9P53xGYitF0dI50bhUJyA8lhLepgNNBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=clqSNRiUhFHVJOD/0kI+2vD37hlb0u3XZrAzzZdHpOY=; b=blePI300Auu4tTiLfX5Bod9vJ1MuhAwAc8mPy4onAoar8JnkukEolOQ2baTZBs6V/fVEBY+QRzwV3yGZ9S+HmjqeKVsf8/1cfxg1EGBiJRS0eP8Fa8dbVozNYl8HCQ6aduetspcKDjp1pm8NzwER4ea+7T6YVJobSMtWCV4gKpt4kQQW04qmxTrRvAU1/EegGp77rZQEvjylG3lQQzsG7CfhGx3n8VfKpqxWmL03XIOJ48x/jfJ2otz9EZbNZC7d2mfPr9ld/11aWnqt8LqOtmWTgg7WgF52rRVjcVYdXImWbpVA566x7znMwytyk13/H8ga4/WsE18XlQ7xixMq+A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=clqSNRiUhFHVJOD/0kI+2vD37hlb0u3XZrAzzZdHpOY=; b=G7dC81LdPIJ73whZDDO92f6QLT2RN7T/0cSExSBlzoU0tDBIK1xid3+EZ712tWzOTOcAy3PkpI4C6NT9ZY0xxICiOEqr649g5ctz8JWXgQwF1NvMIrY0PmRdLClrRFovruIf8tD7vd2LZv24/MtBUQfyMAGw206GZ1v4fcL/gw2ruW9C2+vjM+0S9DKPFVJ9AigL/ITf/CBIGG+UCqdEqNN1L/W0Z77qHWItvqe4E6ERgr/dBT+W3YnU8zwLrzXTb1c9G3ihj6K2h9nNA18m6Nr0KeLqHzJc8dREs+ATLUAM1prfnxRmn2c5vQyWMTSXpoFd2doprWJj2/X50sGd7g== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0165.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:374::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.15; Fri, 22 Mar 2024 13:32:59 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7386.025; Fri, 22 Mar 2024 13:32:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Mar 2024 14:32:50 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [OyTuxqHhI5Vf3Tl6ObJz6bNvRUQAxenDMTONngCfoPE=] X-ClientProxiedBy: FR3P281CA0162.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a2::14) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240322133251.191407-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0165:EE_ X-MS-Office365-Filtering-Correlation-Id: 5bc8652c-3034-49b4-0ca5-08dc4a749729 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zeVTgUFPorSHiIV9ygqBJ8PoIUD9hDUTjn5gz9pjR+Dgc9GB+sSMKm8cSO1RtJsH92OAWVvVGxtj0s6VqgN9027r1618oyo1Lj6AoNDQF6IlL3VPb3mmGBk/OvpsbMxW/8VkNyiarFBcWIMCjqmK+Wzh57s2tOofXcETeuNSjFbKoW175R2BVKqfFhtWY6loMrn/Ym59tS1P8C/1Be4k4FiEXYjxa4v7AsvplBfEqlCwyLVm0YZ+Nw6Sdtz2c3v9PjtB3iqty6DCXzX1WQfUQ4wSYcQQxKFG7v/Bnw/CP4agFBO4w8UrHDDc1jl2JdxmANQ5CxAdQAFZhcWhjG/bjoKH7w8Kbd4WUz1UwNnqIjQhRu2P+vMZaevTKBh2VPZbwylWEtmYdudDUVpmgLvC2ETMAjL8+X/7dyL0pfsxAaWuT0noGW6JTxrFiIXVPOncB02UNju0EM5QErk1ued7IDQnq9IKqkgeLChUw3YNHtKw0s5eDb0kDaiOSM7usB24tUeSVlbCtkbUOuOD4hTWM4g4YM5VEuckLswbmuj32lr7bp5Rd7qOwClZbH6vlAxxanr+X1UjPtRyI2Olmuomj3wtSpnQtxW0LaAoLaHjMC+tE2w2uI0epMbAo5OHKENBhXTezjLhVIEX/XG0XOHsM953t6zbncgnyg4vEksSrruR86BX/ueJjJjfTZQcsUly X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Lyx+hrIaCnf3hPYEOknwe7s6yTn/jfifc/D+9LTiaaNseaSVaHOaRzuRMq+Z?= =?us-ascii?Q?lc6c1vFlLGJMSwhRnHFVZIg1bUiywR7Yi+K+YIHvD6WNpE+Sd7c2Qn26070y?= =?us-ascii?Q?ROmb8QXTWNFJ+LPMlMBJGCrS5X+/yb/U/qR/TX5i32mr3WlRWlE8CLiqiH0e?= =?us-ascii?Q?l/HwXyVZmeCp9ub/xHEWInssLaI3uxRVjC39XDNJYtOmIPuvc9y1QMAAmNRZ?= =?us-ascii?Q?DSsCha4SdVNvRuWWmhEZKXxSbGEyiT0i1tXozdQNu5p7AFMNbjFF18X7eCX9?= =?us-ascii?Q?siXFNRWgTT6fp5us89VLIvf1hjC2S0voA8goAI4xRPKNbI2Of4EUYfJ4esLa?= =?us-ascii?Q?zJw64R4fn+GLGadH7MCYKtpeRGq0D4Jg0785zcOpG+gMU0JhrbN7DjGeYfGq?= =?us-ascii?Q?ADsUaH+4uPEZ6wZb9Sviv/VjowUbO5HgH34vSHnpqtBHSxknULYw5DzyH/bp?= =?us-ascii?Q?mC5mZYN4PphNJVlEtGmS8p+vGPrRdnlxENmQruEe24CBOgv59P7vpBUui58Y?= =?us-ascii?Q?uB53SCq1f7E84tijSktfH7hTjJVfwSgBT1MSzY0Wt4JvXpn4NReg6VnmnKHK?= =?us-ascii?Q?0mjjyFrfWdPOlhiNU+myGlsv4FQQjIjKVd1ysYu5GcrEjmDpWRJKB1lDddfw?= =?us-ascii?Q?F2snbPdkhxzPRCUhCYnxEd2gTYy20IULvDoM7/XbqCljZnN8njYQl+NjUVQ8?= =?us-ascii?Q?w7DJe7ms0Iv/p+Anxafu7tc9eez11M2EY9Z71waw2x6Eb7BP84y56gETVu24?= =?us-ascii?Q?+6/X34+MofumVSnNt0zq0ZZdFEsCUqU0C7dghBlD9DMsxfP3syvDjD1KSYGr?= =?us-ascii?Q?4OvuYYx68GApq/XQEHKWcJgod0B2XAHMey8f1q0Sxp7QKJtLrHq1cD8UocI7?= =?us-ascii?Q?lCVCqSicu+Zf0pkdF/v9lVG5UUXPV1uGmYz6x9uDAJNo9shm4x7hgTCbdXGc?= =?us-ascii?Q?2CQ5KjeAEUmddosl3Ee0P4CL1GOoWTPxgLtX+5N7NGMW6jNRoycEVc9ZjkXZ?= =?us-ascii?Q?JttEz7jgA1zH7GhAWE2d1O84ujNwkDorVHd2hC6OPa8YpiwdDX31qt+HBo1F?= =?us-ascii?Q?0PzCamFRC2v/gyQ8guajyBdArVCBbrH44HCHRL7JElIWAlpkF4q1+B7gDHs6?= =?us-ascii?Q?Toc+iJBTB8DIOl3W6gQ5oqAI2GK1FYp+eCfzZf+81jo/LbIJ2jPah3sALrhu?= =?us-ascii?Q?pwP4f6RdK6Q59NulsgYEKwUZkdY1MJYohk5e7RwtRqXY9NUzZxWCAyGoaf08?= =?us-ascii?Q?g95mGh18jYC/oYzfxJeRs9Q2re+pWKF+wSzctnqkLQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5bc8652c-3034-49b4-0ca5-08dc4a749729 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2024 13:32:59.4545 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0165 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/libx265: Don't use AVBPrint unnecessarily 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: Andreas Rheinhardt 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: This code uses the AVBPrint API for exactly one av_bprintf() in a scenario in which a good upper bound for the needed size of the buffer is available (with said upper bound being much smaller than sizeof(AVBPrint)). So one can simply use snprintf() instead. This also avoids the (always-false due to the current size of the internal AVBPrint buffer) check for whether the AVBPrint is complete. Furthermore, the old code used AV_BPRINT_SIZE_AUTOMATIC which implies that the AVBPrint buffer will never be (re)allocated and yet it used av_bprint_finalize(). This has of course also been removed. Signed-off-by: Andreas Rheinhardt --- This has actually been mentioned in my review of v3 of this patchset: https://patchwork.ffmpeg.org/project/ffmpeg/patch/20230817214858.184010-13-jeebjp@gmail.com/ libavcodec/libx265.c | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 70ec6d3539..d7620878b8 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -28,17 +28,14 @@ #include #include "libavutil/avassert.h" -#include "libavutil/bprint.h" #include "libavutil/buffer.h" #include "libavutil/internal.h" -#include "libavutil/common.h" #include "libavutil/mastering_display_metadata.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avcodec.h" #include "codec_internal.h" #include "encode.h" -#include "internal.h" #include "packet_internal.h" #include "atsc_a53.h" #include "sei.h" @@ -182,13 +179,10 @@ static int handle_mdcv(const AVClass **avcl, const x265_api *api, x265_param *params, const AVMasteringDisplayMetadata *mdcv) { - int ret = AVERROR_BUG; - AVBPrint buf; - av_bprint_init(&buf, 0, AV_BPRINT_SIZE_AUTOMATIC); + char buf[10 /* # of PRId64s */ * 20 /* max strlen for %PRId64 */ + sizeof("G(,)B(,)R(,)WP(,)L(,)")]; // G(%hu,%hu)B(%hu,%hu)R(%hu,%hu)WP(%hu,%hu)L(%u,%u) - av_bprintf( - &buf, + snprintf(buf, sizeof(buf), "G(%"PRId64",%"PRId64")B(%"PRId64",%"PRId64")R(%"PRId64",%"PRId64")" "WP(%"PRId64",%"PRId64")L(%"PRId64",%"PRId64")", av_rescale_q(1, mdcv->display_primaries[1][0], (AVRational){ 1, 50000 }), @@ -202,28 +196,15 @@ static int handle_mdcv(const AVClass **avcl, const x265_api *api, av_rescale_q(1, mdcv->max_luminance, (AVRational){ 1, 10000 }), av_rescale_q(1, mdcv->min_luminance, (AVRational){ 1, 10000 })); - if (!av_bprint_is_complete(&buf)) { - av_log(avcl, AV_LOG_ERROR, - "MDCV string too long for its available space!\n"); - ret = AVERROR(ENOMEM); - goto end; - } - - if (api->param_parse(params, "master-display", buf.str) == + if (api->param_parse(params, "master-display", buf) == X265_PARAM_BAD_VALUE) { av_log(avcl, AV_LOG_ERROR, "Invalid value \"%s\" for param \"master-display\".\n", - buf.str); - ret = AVERROR(EINVAL); - goto end; + buf); + return AVERROR(EINVAL); } - ret = 0; - -end: - av_bprint_finalize(&buf, NULL); - - return ret; + return 0; } static int handle_side_data(AVCodecContext *avctx, const x265_api *api, -- 2.40.1 _______________________________________________ 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".