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 CC7C844BFE for ; Fri, 11 Aug 2023 10:45:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C6CD368C8ED; Fri, 11 Aug 2023 13:45:48 +0300 (EEST) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2011.outbound.protection.outlook.com [40.92.58.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C460968C335 for ; Fri, 11 Aug 2023 13:45:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JEg8C+6PkkKyKCT5fb9DKH9nOsoxXv+G6kZo4ggJ9N6VdDh13FcMzQLqTGskhEqat7yxgKwZo3E3kMzzi+u0yqEbTSjmVRTo3nWrSWHDQ4rcS9chpwXyhJFBj7Pwns+AOGI+CzRCvojJazftlSLIF544dDNYa3ltU2GS4LCbm+zG3xap7vf71Qii6kKxWZ1brMxA8NjnDLM6SVKmJYTD/S/wi4Tn1gApvunH76+Zof3V5hIODGbCJVcf7QAZK2gzU6fFCBes+PfMTo/b/xSfRowwCuaGegvZrHWUio0ty1IpK0jXp/I9Ax62iG/4Jp67iYvZp7pfATaGK3BBO9Z9RQ== 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=L9GbMl9x3AIcMK3K7eOZlMGp5ebIowdj6XjqOYwzjDM=; b=bmiTRx45jKs7GZOoHJrofFXDbEfTvrK4dyzTS5cDICNrJBezGTLI2NEEIfFtQr35Ecc52lGHDgZ6IU42lxjm2pG2Kl7eQAnBrIdo1ONujwvLTteD9VvKSMuvYvSIyv0gwisRoS1yx5Sp1hqYfYlzZe9XQVLPJkuF9N1HFoY8ZQeK+GFfknmiI2LubVYiBIp5GtQxuQniLXfImUeqJAclG1iXzJw+KlL29UZudh1FhhyqtqzwiZwbbjvzyJm7qcL6jSAJobir6X/CaBPJSOErG24COmTO+LiC3k8jmmBbQ2ZO5InWOYJlyeQ5JTONAadNotcrB/PvnMvi7cG6euL8Ug== 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=L9GbMl9x3AIcMK3K7eOZlMGp5ebIowdj6XjqOYwzjDM=; b=o4js7wfnkmm9xrEBRnOBcISVyvXL9aU47ufFCgy/yX6p4VGVb4ZrydMobf4bD4Ld/7aK0r3ip2DPfNfpQDH0xyzLYpS+MRLR6EdgnFYzlzpkW5J0N5PFsITFhLriUkcewk9AN21gqXqIdZxxi0RH9YOmVHSZM600DytDClN+tEUo0auyw/Bs0fGP6Vozv47NC+S83c7JfV6wXfWRex5Yn1hWp9Zyxwrn6M/X9Oixq+nT6lu6drUjKAuGFeNgVvTZawF84eWSH32gUT6XdixistE6jXYVY5qbNJlWRp/DxXCzNpPBp/IyNECxih1Yps9ea+1NhNVHtYRib8ZV9+AqDQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0273.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Fri, 11 Aug 2023 10:45:46 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.029; Fri, 11 Aug 2023 10:45:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Aug 2023 12:43:28 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [wgNIGJTzwX7Q1RWGceqxPLTz3cEU0ZGw+8o7loccAyU=] X-ClientProxiedBy: ZR2P278CA0021.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230811104328.2278289-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0273:EE_ X-MS-Office365-Filtering-Correlation-Id: add3eee9-d0b3-412a-e6c3-08db9a5816d2 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpEPU/wJLY7hod/UA3ILpuOreVopCMS1eE3B0Gk7a4FbcvsuGwT7sxQh6gg/hupjKeZ1TtQGbJdrh92VQZ2sxRFqOwmPc0qFnnQoKm2ZqAiuoCrYpTCr9VZRJhPiut39pechlqcCz9cgDgkUQlv3OYK/YbKqZvhA7evMEKQpAHQE8onMhhEOuhu1MsOYVqPJKeBuaosaZXbTXQeQXsgq9G0vHcRyA2vBVTEiAkjEduXeAqLwkooBTf6H7KYMbj7A6EYnR8cwX1/KKRxxnTqbSr+tYOpfZyjKpgZF1N7poGGuow08qAyfYEbjOn+aoR3lFI1Ep2UMNqPuVvysLFW0jPyLOxTtDDSuE5WMxOJrBMb5taF6F76F+1KgKcV9MUvfqnbJuqh/FjbHl4gKg9fSg1g+6A0aXWxqBzvpYkcrfhQeVz+QZy5vr1fMxLRmOcFeigB4TIziKnzLGOu/svXvYWIXbSkoh+KPv50QV+a9seqlFj6BC2vEsal3JUDIwBB0qYbdRi78n4nxbrih8K+LRe2iro0R52KeNgwK9fOpu+aRDm+KN5XFFXj6+ORJMe0e7oCzK9LF+WvJEhNAnfU0KP22EeqZ67H6W6mekM+Cdp3hUJLEjeqlNJBq7YWK2UHRMGcoQIaQ2NYQRSR0wqKvLS+H/cjWtzuEBYEbwmv0tGOOnKcjIyuYR3Ja1fENFx9wlhLfhNMfGyWZ+ZcsvzdVVitxi+9qGyrVh2VSQvc6CH8P8aUUYi5fYA6U3v7HwPsZ8o= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5TpPz6eeo/6iN1Kymy+2fp/1lCavvufaPHrvdwFx2jIwSDp6XArP2tYIq9U+652hYDVYP7UEcWCdiSws5xE54WGiWKeF44f4ja7re4XLe8Tx6Xubhdjr5IHyVTkPYNjT8NxtecvFNZFn1WczmCSieodqC1ZehO1TeInIGEvSmKm3A8MA9+7fnUmJSCjOnfJ4KDbLiy3RnyJvZlur7serHyoUIyiEJtXRai0vZkLfDF9QrO5bnqCTwK5UI6X65lW1L5lgDJlZIQ66dTwHxzkJ/ck/X/8LGBAeCsoQqE2dy/I5C9x2KFlLYZ/sr3WugVOnJTQdVG9jofpoxaU/uL2FhN5fW4TZt2x7svPwqu20L/whm4xFBgSRmMqwLokwEmYeR9PhOiTOEdWing+tNNtvY9YZedZ8RCysoQd6Bdew77PxW5srypO3jvh0sXg/WDF6ew/FLrfHa9sa5bPsNG5ML59oMAQ16Tys8e361TRi0AGn1dNFm5BOGpJZGeWv89S2TrpY8TwuX4s+n/sbGogwT9Ojj94crdrepkwSHrD0ttJoM8t4lKYHnEftj9bJGMdY/KETLD267Fb6e8WzYiai6Jiu+U+OFSRQnWtCo6pOagXD4ILvvYxfjH+uxLASZgGa X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Kpg3F6To2/k/A2fZqIf37FcUS59i/7zW0JQAWBLJTVZkMgXkRJ3Yr78D3L/R?= =?us-ascii?Q?2vHjZdWRHewAUcr6a4tNM4Az1nq6IBNtTDDOATyhfOcqBnP8aetqC9uFiHuk?= =?us-ascii?Q?YPxTCPRecOp/WmBK0DtqxGwHzyijIgyMN0eEwx5fz+ZQNUUWN0kUdhHNoPQ+?= =?us-ascii?Q?cSFfEh1TfDJan6a0iCw7DUNkM8eCi0KSUv8gw6cwkmMwpdtellZ4fIr1CD/R?= =?us-ascii?Q?Z5ZD5Sptj2wu/RZJh7XqPyRb+EOeqKBPXWyMycLaPKHyFSOeizDutYhHG2Zx?= =?us-ascii?Q?1wN5dUpgf/WQcL9H5VRA6NHq6ziTdCfjohoJYrRRfNX2W0QkcEd35YuOrZhw?= =?us-ascii?Q?tbRENvGAsaBWrcYa4HQuDhFyvAmUfc0/+QBh4To6PRCyG2HlaJtydII8Hqmm?= =?us-ascii?Q?SOe+iwVtZmrED7f6FCwgAsM25kczR8vS0xabtYrqDoEwn/KwTtG2KVuap7kE?= =?us-ascii?Q?bdMao+RIOQR0vUlD5YKPHzrTeuYYZUJ7Mxaf4CQ2/gXnmz9ZsGCSg+8W1HnY?= =?us-ascii?Q?kOhJtd6xHPQe/qspLv+EalkCwqEliXGqJo7I6tKf8fX3CZNNcYIqWOyMBNn5?= =?us-ascii?Q?iBHyzoCo50MKwfQ0gfMr6Wkk7Ryyqwcw04nuSfzHU4KkMmgY3nbyMhcMb6Qz?= =?us-ascii?Q?sPanEfx1yczx18pAl5kWlNkPF7GELdmF9nUv70awoDudGmmbW+mrlka8Fwu0?= =?us-ascii?Q?NeXsL/YldHYo2FFZHZ0Z+tcN+LsomT59JVwZLrmWC5kGC+GdQaksV1Iyt9Go?= =?us-ascii?Q?OSlV08uE8p13TSb9SQYjnvf0uEgu5wodzDnxdt/jnABLMxqI8BEkRMH3oTsG?= =?us-ascii?Q?ZFB8TIRSG769c/6NBEnpEy03MMcDU6piiGY41HhbBmDyHf0YqFwz9Ar76CrS?= =?us-ascii?Q?2Kn13q7O2sPumpe/QM6QjdM1HOvO5AHfWfuivNQOrDxJ9vwsKeG40iBhVX4F?= =?us-ascii?Q?MgHoYyTfxBi4mbHww+YGmqwlhZuCoXsPqHYcwk1NTsdaVdY8N3gkWEUEEYj/?= =?us-ascii?Q?kYANpzE2A/ceGdBSJ1vW8VX8yN+T8YLU7D59qUdDLAETW3/lQrnC8Amcj+EP?= =?us-ascii?Q?eSIREvm60V3VmgB2RsTjncoIntkEWvZg5W3BucBhLOFVamlBC7PNj+o5tbN/?= =?us-ascii?Q?XB+BRIoJcMwmf1BgpE/xHXM8GG+bf9j4UcymY9rm9s9UhwiMyEDGYoPO9cgT?= =?us-ascii?Q?tU4NENupZCwx8G35zDLcTePFF+8m9ftjGOJuRnboio6extOuK7gtaKY5tdTw?= =?us-ascii?Q?bV6ier5K/eQnsNBRwHca?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: add3eee9-d0b3-412a-e6c3-08db9a5816d2 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2023 10:45:44.9353 (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: PR3P250MB0273 Subject: [FFmpeg-devel] [PATCH 9/9] avformat/riffdec: Pass logctx as void* instead of AVFormatContext* 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: Also stop second-guessing error codes from ff_get_extradata(). Signed-off-by: Andreas Rheinhardt --- libavformat/riff.h | 3 ++- libavformat/riffdec.c | 22 ++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/libavformat/riff.h b/libavformat/riff.h index 85d6786663..a93eadfeca 100644 --- a/libavformat/riff.h +++ b/libavformat/riff.h @@ -67,7 +67,8 @@ void ff_put_bmp_header(AVIOContext *pb, AVCodecParameters *par, int for_asf, int int ff_put_wav_header(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *par, int flags); enum AVCodecID ff_wav_codec_get_id(unsigned int tag, int bps); -int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *par, int size, int big_endian); +int ff_get_wav_header(void *logctx, AVIOContext *pb, AVCodecParameters *par, + int size, int big_endian); extern const AVCodecTag ff_codec_bmp_tags[]; // exposed through avformat_get_riff_video_tags() extern const AVCodecTag ff_codec_wav_tags[]; diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c index 1c149388ab..d987858c73 100644 --- a/libavformat/riffdec.c +++ b/libavformat/riffdec.c @@ -58,7 +58,7 @@ enum AVCodecID ff_codec_guid_get_id(const AVCodecGuid *guids, ff_asf_guid guid) * an openended structure. */ -static void parse_waveformatex(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *par) +static void parse_waveformatex(void *logctx, AVIOContext *pb, AVCodecParameters *par) { ff_asf_guid subformat; int bps; @@ -84,21 +84,21 @@ static void parse_waveformatex(AVFormatContext *s, AVIOContext *pb, AVCodecParam } else { par->codec_id = ff_codec_guid_get_id(ff_codec_wav_guids, subformat); if (!par->codec_id) - av_log(s, AV_LOG_WARNING, + av_log(logctx, AV_LOG_WARNING, "unknown subformat:"FF_PRI_GUID"\n", FF_ARG_GUID(subformat)); } } /* "big_endian" values are needed for RIFX file format */ -int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb, +int ff_get_wav_header(void *logctx, AVIOContext *pb, AVCodecParameters *par, int size, int big_endian) { - int id, channels = 0; + int id, channels = 0, ret; uint64_t bitrate = 0; if (size < 14) { - avpriv_request_sample(s, "wav header size < 14"); + avpriv_request_sample(logctx, "wav header size < 14"); return AVERROR_INVALIDDATA; } @@ -139,18 +139,19 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb, if (size >= 18 && id != 0x0165) { /* We're obviously dealing with WAVEFORMATEX */ int cbSize = avio_rl16(pb); /* cbSize */ if (big_endian) { - avpriv_report_missing_feature(s, "WAVEFORMATEX support for RIFX files"); + avpriv_report_missing_feature(logctx, "WAVEFORMATEX support for RIFX files"); return AVERROR_PATCHWELCOME; } size -= 18; cbSize = FFMIN(size, cbSize); if (cbSize >= 22 && id == 0xfffe) { /* WAVEFORMATEXTENSIBLE */ - parse_waveformatex(s, pb, par); + parse_waveformatex(logctx, pb, par); cbSize -= 22; size -= 22; } if (cbSize > 0) { - if (ff_get_extradata(s, par, pb, cbSize) < 0) + ret = ff_get_extradata(logctx, par, pb, cbSize); + if (ret < 0) return AVERROR(ENOMEM); size -= cbSize; } @@ -162,7 +163,8 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb, int nb_streams, i; size -= 4; - if (ff_get_extradata(s, par, pb, size) < 0) + ret = ff_get_extradata(logctx, par, pb, size); + if (ret < 0) return AVERROR(ENOMEM); nb_streams = AV_RL16(par->extradata + 4); par->sample_rate = AV_RL32(par->extradata + 12); @@ -177,7 +179,7 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb, par->bit_rate = bitrate; if (par->sample_rate <= 0) { - av_log(s, AV_LOG_ERROR, + av_log(logctx, AV_LOG_ERROR, "Invalid sample rate: %d\n", par->sample_rate); return AVERROR_INVALIDDATA; } -- 2.34.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".