From patchwork Sat Feb 10 23:04:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46168 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:a586:b0:19e:8a94:b663 with SMTP id gd6csp1752954pzc; Sat, 10 Feb 2024 15:03:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IFQoS9BXRO2jxKuAqtAW2zp9yURQrXxaJ2QJ6UjcqGSZrVNUTir/Wn2BR7xRC5FiPP6kxvS X-Received: by 2002:aa7:de01:0:b0:560:c7a1:dc4d with SMTP id h1-20020aa7de01000000b00560c7a1dc4dmr1750100edv.33.1707606215295; Sat, 10 Feb 2024 15:03:35 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVhxhotb7BGJJO9XHXAjncn9oYDtoz5a8ps+CSCXNvDckWkqHrLQmE/X3il4v2WAcxrwmeRKmkq7Tg8/IDD6pV9IgILfvDQdMtsQcYSvsriAc34OZcdeOTMUW/Xm3yiWy+BF/iDyuOg48AAAUwtoHAS24vQTduniof6DaezLCu/EOCq+qAwXJ1sVYOXlXriX6RgHd14m+Y/LLSLfQWrbtYRvMOYFkav4Hr/t3xu/ExaSWqHG1EeyY5RTfPDrwodlvWApnhLp+SH1gCwE6n2ZNAUZORup6Woagj0jdWUL1AGN2ve2iD7V970yMCM9FWELmt3k68GUWmjkTn2k1i5CudWGqPQA0YLEDNaQDMoAHf+ofXRKHq6EzhmBg/jvkTWUeIVqLNvCNRL/4y0jE8NDkKFqPGFNnWfXet/llkuK+ICtyK0bYL+Ilbrx9srkzDCFBSBrNm776ZzhmEMt18H5TCBR6Bpg7AavhqQkoqFhCg4QLImAN6b5HZolQjpMLddrv70pUuVpRiQRHw6qiJ99lHQICiEeuoFwIisbwIbGHLJ+nZjFtQLlanSIcg3v4J8k3vUeNTi4payY4h2dE4alFm06NkF702Bzs80cZHZPLfMCKKu7P51/DWxqHVb3wIolww5oxgruSiNHYLobmCcPnpJ5mzzelMs1uL6k8vqnwEzdaeDQjSR0ewWCsT/Vkq5Ts25wuTGdgHv8+j2WhCHaCZQQf1D5pjLkS+qYFNQJXGhcAQBoU44JOckDInsBcPjVB8bpR57gIiDXnLgbtEc89jfd+vxInj/htkYgJPv2JXz4KUAvTONtC2MRx5Ly+WcEuTxY5CqXBNkp05edtM8HywIo5lCflF0zCNs2+u3oRFUfTKE8fgdFGImfY+DieiyNOn1K3Z+eN7gjGiXvwjR6mO8TuaS2vjJgUKAClgnrugemHmAb1zgT9Cb4IjNaCO7IkeraT IgkWUJakINqF+Hj8SypJXWhgIhLBp6sI6fUaGJl743bE15oIpaafa7+R0dp1sbam32o2WpctwczGwXRgf3FKGlHiWSxZpXasPwuRHODLq/1Ce5hHzke/T09lWyrxRsOj/fr6Zwe0L1Nihk9L4zf8ipe4QQ3I6lAKCyYxzWjyp8AW5IcV0Vq8WDg8UVeeQpqv8/3hQU9zm0VHGyLOluQSVZD8u1JNhWeNbfBx8idnbzEEO6v95Jq/li5sR2LHlygnWypEU6U3p23JJLY4KbCZVqBWRXmBjxjkuOwe0zRBDvZIhD63s5lV2klpT0fUHT24kKadgrI4VblQHKjNUTRXsippC+d4BFglhKgTEcJy1d050btFhY6MEB8o6SpbOnM0q1rAQzIAqP2IvFCohGuWe3boBjq5cGJ1BIcbHHJOmhaEHXUEuGWoujwZX68DG1rgO6G8jvtLLEDbq8IDM+2+wrfyZzwX6N2o7tHajVfppu0kwQOUu4FLWoGrwbOJdx5P68GqX56LXQxT0pK0kUWVo6tcsQ8OjWpmSUfIvEeOh4JJs3249ebTHiKSIYhIC+aYeA5FOR7DY+vx9r7JQdRxG40bFYBY/NheEuwQA= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id da9-20020a056402176900b005610ed87a67si1164759edb.336.2024.02.10.15.03.34; Sat, 10 Feb 2024 15:03:35 -0800 (PST) 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=@outlook.com header.s=selector1 header.b=Rwtv3zbV; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C0A3B68D17B; Sun, 11 Feb 2024 01:02:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2036.outbound.protection.outlook.com [40.92.58.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6FB8668D13F for ; Sun, 11 Feb 2024 01:02:52 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gbC3P3GqDQmd1k+9B23Dzwx2cqcEjbkim16Oqhppdlhi/RurRB8/QlsZg9n8tO+UC2UecJ+WvR3Ya/iLivGYVYpXyZxdNNEMUZb68nvD207WXaFzIqhTOU75sVBJe742WjkppDndkje08DSrx9P3RHZn45Nun8QV5ScGU2xKVH3CTxxv48qNpwK/mTj2d7KOIFSqM+Y04B+vKrzFsBFrTucZOMpU5f7c0QNke+Kmc6GrS4WsBH9BiDsYuiaxoep3DqIN2A8vUU1fAFzh4/aN1cHv636hzpnxIKnjJLx6elr4iAwDCwNRlo3XkbPZbgC2naDQpSICQpXc1agdf1bSSA== 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=tALmk65H5GvVTCZCDXDmkleBMwp99PbagbYkCGQjyWE=; b=kkyiZjtHNHWU6X8rhTKQVqOA2TQ6mbDofX0I47m+9a0yUQbT12pg0O0gJzA65J7CtWUj4JDrhgFn0Hb0Nv8rO3HKMOGn8SmOw8VDjvPH8+ouWJ5zPAn3Y4QrccAjSUptPhggX8DSc++adKhf3zV68bj0jIWM3vXwyvFbLL3d8U1qwceZKbSRr9py9zLC4wLfabZAVPqwibnzuOY/Zb9iwPYZMI2knwHE9GXLWzslTokgXQMMu1FChbsXW6BqliUUl6E0h/prdYdsjGLPufmCp18L8tewmZYUYzmqwmR3cTkvDAif/Kpw4/KHaG5gRLsX8El/njRwldSAHSyhAnJ8pg== 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=tALmk65H5GvVTCZCDXDmkleBMwp99PbagbYkCGQjyWE=; b=Rwtv3zbVvFZo/XCFwdsQHk7TvM1pKtMUZ5/ZD/J6JYDLnQcpNnLSJmGgKSfXMlJQKO/zUtBsLttPE2FzmtGiKqnSzm/FO6WmmDxFC4SU+b4FyxiQL7VMMGaB1B0RRz9UUNA+hGsdyPEXeRuryxNTYg515TRyGyjxkXDZFA6OC5PgTloJP4yR012wc8uwcHFlnoMzstMHpQEWZMKdT+bwHYNMjWFIuV1FJMIlzAL3xoeixwwqHOrmo1J3ycM6B3cZnA5+b1dNgRpd5VbXRSnJuI9WpctPxJx4Om4t0dtLFC9uT35gzADNujP+dFb5gX3goKOt42bhWLTPANYbPHY/Ew== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by AM8P250MB0373.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:328::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.35; Sat, 10 Feb 2024 23:02:50 +0000 Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc]) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc%3]) with mapi id 15.20.7270.033; Sat, 10 Feb 2024 23:02:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Feb 2024 00:04:11 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240125134425.374-1-jamrial@gmail.com> References: <20240125134425.374-1-jamrial@gmail.com> X-TMN: [9N25kaY3uV4w0M4JWx43TwFVSFqkNW37d8kKP+u/Yj4=] X-ClientProxiedBy: ZR2P278CA0003.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::6) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: <20240210230411.2616270-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|AM8P250MB0373:EE_ X-MS-Office365-Filtering-Correlation-Id: 61115611-a7dc-402a-9613-08dc2a8c67a5 X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicCxfSlM0Mf+zc92VeVIBtN2kEN2mImAxfQm2UC1fT+ezoxSeUd+wz+MsixyY9GhWjRmHAwaQsjqKnSGUzfI9FOhyRgIfe6XRTrFDWtcWiM6R1EOWMxkSgEavWVMl0NYRf7dTBsw2fAWoqmcjhfLxdgyBG95F1RstaeQLVtdkhzSmU/VImmERGj2zMDCTg9/VvkK8CSY1HsX+fpPkiJ7/89U1LSSZS7h1CApqfKS8MeiCvRu1oYAIRhzHKooounp/dhWQh/15dFtL8SwnDhk/M2RxtYi69cw18gqnALfU9Epan7Be8obDDPexCvZYiI/vedA3k3lmUWQiBOjQ9knh17i9zrRS3XZNBhcojFW3m31M2HfKotcDCvy56WTg+3JbHAD9MjFDDcR8DP0z/TyOTCdr+/r5tpSQcEbxzJ0UtOAovSUSu43vAOXRYkVi7D3c3a4HoJ10NO0AmAwig9o1bQNtY5d5fQ9smkhhf1lVWZEbPp56NHNB3D4T23ZiEb4qo4JbZqF9SA6+QF4RzgqTYw2g0XZ2uRVYd/dUgjl70tqdwwUxLX6X5Z0Owl+n7uuEt6wjqrNcToMzyYrBFL4QwTRHBNdKbOphxg3X1WwlEaIyU1Kn/aaSpV9fpewjTdjlkJdEs+UUh2gv7AYo+0D+zCwoL1p1PnbwSUZM41fMyT+H6d1o3Rd74Z6c6ykR83pIHJIFcSUk8fGiGo+vo2xbtsNvvogqcqm3HPkwowYcwGLGg== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HWLrhpMh0xWYzbp9Juwsdmq/J7UWozZHpfwJze7kKLpIrUc9IVUAfzfQN2F/FbeRQVU6v0kfbg/WUSqR8pZjKOHE2FjegmEVDqF0HDA7SSODnMmcd9MKepiDvPrCO0lWAED4y1sLao2mLq32/2cBPLdoVeTv3KaD3kQ7jVCp+5K8I3ueWE3WiszjRlo7rSUOWYKkl1mD8vl7GK1ZcXJqGfUm8mfPqY6y+D42260nIsx3WW0iNR93ZbNgOAyPYTgvUDNcSAIa127pEEG5Ne05XT3k5jejKcsNaTN4DqR/CQJ+uj9QyaI/roX87I+axAamHPg7AkQyMpOTJ8mHtPFx9eexy7rrVo+MNyjJGc75XsyzPIzXZBK1obmJWE6Vhd7F8KKuI2Vn5YfMIX3yIdLRVbzKfe0215I8i79pHhAe+4w17zRuJKeNjv4ozhwO3rA/74JfGeRHDt7DGo1JqNyB4HnYFb47pj87Y/nbXFimVsFeajz6Hfm8ooNFYpTqXPu8slihU2/qvEe+JAM7mSeYTTODllRbbolTaIMEl2T1XHfGUDksh+1gMQMdP4e/02PxtxR1Uho0/nfyivvwidNSCx/Dc/Af7WjuHEheTIZ3q6N9De8rdN/OB2FolD54rw2t X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vXVQBAl3mFYDUlS3XO52I85JHFZGxqiealt8gf2mPSui5wZfM/PaHdbp8AQFeFSxlGw+k1AXWthU7/aYksBN4rX87u7MxXo25qTfRrtm163XtJg3XHMHVoW0YzDxxbo/g6iz9Q4n7bFxGzrf1Frc5HEKanYpSn/KfnovaIT9HVri5N68jEOLJtbFYPDRjVUB/afHSUQQ2iYQWxqYiQc1+M0AahaXjE3eBq+ECq9YgzT0X1s1ebtM/1NHCDoX9P6A/v0aE2Vf04SwyW6GsaJ8Zhpt+Fbz+yZdZA/R2j5/aNvICKQ5WCEc5jeAARqgiw4m0JJDMHji9id905R6rHrkJ6iigMaZD1VXbvGA+PpPQG3rXDTZq6L7G+WknpUYsrKna9+2GC8tUV5NI7EKGnLO+rtCgdJogrlG8/e5SxZSWqtMYuHePBFqUZMv7OFJ+3yjVIOWVUHEI1jtfpf3RpYQXgxhHJsYI0ZtduQdHxtkV4KaVRiqYcEyavEKMnB2hXrb+4bivGXHZXg7ocwtK+2BNbZOErCw5KH8kSmGnhgV0x1xp3WnT+9menOcbX/kIFtPx3bukB816A1vVzrplEeXCjNXZQJRLQn48FKhd4OzOANEqnpHhu/rB6zFI2MQD6D1qNASxJ5yEVSBjojMJeDGG4VrLUsxobnK2gBDLXXymjzm9xsPUbEu5lsCzRok/vjmY2S7c0zsbVocN7VRt4BL+5HzB/wlZkUgCBjjWAs49XjlxpIsir8CSA9xkUHNb9kEBzaGCn670lvt0H6OZcx8BW4SVa+nm95syod5a64k7PpMFfLuV45pKlBbW3iW5vl3Ey1Rxhida72kLo73H+Hx/yQ+ze+z5w5Y+VXRnvppHOrSCUhuHiDinSYal3Veu7IbE5ICDLAtnS+rNtXlCt0Hqi3qKYx6StZompXkTnILO5JDGTjlFi6qNptOJyJORo/sh0719RokTBvMiN6GbYQHCfE3apfDsnVK81SBXfmTrxII2sw0pB+56BI0w0DYj5DnEnL9r/683I8aGCBggmjZbe0pPvm28fC4oeoXxZnif2Fb0JgbDMImrGxlhbleigG3hvJl7jANSZDW5GJTy1hPhHN7a/6hi+dq8jT+URO06HGA7wzJznNDx14PhV041rfJUXYHV9qiChg9bWa30gttOTP+EP3Wi/UnDEl4L/3ZH7rj0FlGAwfOu17oCXOddzYSvgdvmevsAQbn9aUr5MFOqEtYINROOkMfngLIiCNmJ+npsyiou7Mf0PPIqiRxhTx91+utOH21i+GLmz93X66Ugw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 61115611-a7dc-402a-9613-08dc2a8c67a5 X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2024 23:02:50.3874 (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: AM8P250MB0373 Subject: [FFmpeg-devel] [PATCH 35/35] avfilter/avfilter: Reorder structure fields 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jWiuTAO7hLbe Move related fields closer together and try to plug holes. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.h | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 35840cfd54..f376d25efc 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -441,6 +441,13 @@ struct AVFilterContext { */ int thread_type; + /** + * Max number of threads allowed in this filter instance. + * If <= 0, its value is ignored. + * Overrides global number of threads set per filter graph. + */ + int nb_threads; + struct AVFilterCommand *command_queue; char *enable_str; ///< enable expression string @@ -461,13 +468,6 @@ struct AVFilterContext { */ AVBufferRef *hw_device_ctx; - /** - * Max number of threads allowed in this filter instance. - * If <= 0, its value is ignored. - * Overrides global number of threads set per filter graph. - */ - int nb_threads; - /** * Ready status of the filter. * A non-0 value means that the filter needs activating; @@ -548,14 +548,25 @@ struct AVFilterLink { enum AVMediaType type; ///< filter media type + int format; ///< agreed upon media format + /* These parameters apply only to video */ int w; ///< agreed upon image width int h; ///< agreed upon image height AVRational sample_aspect_ratio; ///< agreed upon sample aspect ratio + /** + * For non-YUV links, these are respectively set to fallback values (as + * appropriate for that colorspace). + * + * Note: This includes grayscale formats, as these are currently treated + * as forced full range always. + */ + enum AVColorSpace colorspace; ///< agreed upon YUV color space + enum AVColorRange color_range; ///< agreed upon YUV color range + /* These parameters apply only to audio */ int sample_rate; ///< samples per second - - int format; ///< agreed upon media format + AVChannelLayout ch_layout; ///< channel layout of current buffer (see libavutil/channel_layout.h) /** * Define the time base used by the PTS of the frames/samples @@ -566,18 +577,6 @@ struct AVFilterLink { */ AVRational time_base; - AVChannelLayout ch_layout; ///< channel layout of current buffer (see libavutil/channel_layout.h) - - /** - * For non-YUV links, these are respectively set to fallback values (as - * appropriate for that colorspace). - * - * Note: This includes grayscale formats, as these are currently treated - * as forced full range always. - */ - enum AVColorSpace colorspace; ///< agreed upon YUV color space - enum AVColorRange color_range; ///< agreed upon YUV color range - /***************************************************************** * All fields below this line are not part of the public API. They * may not be used outside of libavfilter and can be changed and