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 27DEB43E16 for ; Thu, 15 Sep 2022 00:52:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 94F6268BAF2; Thu, 15 Sep 2022 03:52:30 +0300 (EEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074021.outbound.protection.outlook.com [40.92.74.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7EE0E68B96F for ; Thu, 15 Sep 2022 03:52:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H5p5HtuwAX5HRLaNj+59CQazEB0A9TV0LCrAdMgny4jp8kMJjodhgkp6HQrwUQFjuojnpY6W7Ssi9FbE3FsBvg1BWUD2zCn35qaaXVFTwFK1maYcGhJbh2O9hnITKHAG0LfWJ3MxDoqusjGDfey+dDIjTTSYYix+Qd7nbMXAkxqoF7R5eALkXPdVfPgfKr2TPa4XPUnOkEyuElNKjKQP8MJYkz54eFfh7tw5MNW9b5yIL7apy8CQihkFnMISqrk1+yCsZgvYSM/pzkGJ92LIoFMUmNLyQhYmZCHeVtrcRviWWyYZ+UcGaQD1vTTySSGrTpcIB4EwI9dEASsrW96Fcg== 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=ipeAoD+4yZRN9CqqaMHP8s3E8ljBrDeHwiDkE63PSZc=; b=RNiv4Tk/0obXY2TadRBVDSql5wmqyhXJ50LmUVal3aRDMyk6+xw8WmC3A2RjQdKbQEu8+3u3Fsv5/+mV0vXaXWVk8eoEewBImklj/76eIn2NBqj1loqG00M4B4PrrvWIdWiDq+ISOjXlOd0AhoVUYWqG2MLnfYo30sex6/x+wEHrjpdR8N72/ykAb2qVYa8dLlgsgQLkSQYPOkCj2vcvTbIE1NeipoEP2HrESqn8liVuPomH8p1BXC0S6OQrH0WX3WhnjURl11DPYQUz06mxALJUBpMtWhEHoLhobpNHf0pSpphMIsDbIjZfJrxuSgRG2DVz1ouy3nL8SNQD4u0mqg== 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=ipeAoD+4yZRN9CqqaMHP8s3E8ljBrDeHwiDkE63PSZc=; b=cHZ2Wm25M64QJYizN0fe38dhdNRmDE5WmcovN72ZY/eVPF/PaMvWzAhNSE3cpEHEEAGZVCvrxibtcZQ4YSSoDKJW/Cgmz0fe9X/wJUM+AOYXiwBlSroz3VUog6KI3p8b5VtsDNCm7ElckWvFoHi8Vu+6NPfjCeERzDSe5irQfG1+vluf2OH+OxT7IBimlAgiZvXTJqAnL77GfNtV+UPpd6DPxFZXR9H2hOpgLrvb7IRjB3+57KWMu2teve9oYLXf4CiQeUXgU7OFnZHzzQIZuqMxmiTkRAHWdM2Xtut8W8DwkrBXk+9zRYh1TPr6AVzLzZOEde7wT0G/AbhnwwA+QQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0077.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:23a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Thu, 15 Sep 2022 00:52:22 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb%8]) with mapi id 15.20.5612.022; Thu, 15 Sep 2022 00:52:22 +0000 Message-ID: Date: Thu, 15 Sep 2022 02:52:25 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [fMcNenVnqQf2JNFbOSwU0q3m3uIxBLJW7UPloygSpv8=] X-ClientProxiedBy: FR0P281CA0042.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::9) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0077:EE_ X-MS-Office365-Filtering-Correlation-Id: 116c05eb-1a7d-4202-baf2-08da96b48c7e X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vKJOWrYudcrSQ2gHU3ZDGBNXCE/Hov1t8yQ9kkTrQGu+zZDy7U0TEGFtfmZT+aqJc8M6aMTHc6JpNiqEaMq1Tm3qN1SXQxzc34IXsI3LS7TkEHB7OlRPnYfkWnPTlG/RqaiXr5lDqFN53K4eJdOTx576zz8pgKtfbq2jfmCDkIqmJc1w9+fNODcfBgPtejCTsJic/ytX9oy728A35BbijAMlczn7U9o5uj+Ce1o5BZkkQrRZtbKB0mGTF2lnHmFpxJeE4VOQo9+RkQO1fpfh966zy5AoyLTvBWP2Pts8jOJ9IMOmINR2gXl2M6SxGyWlTT0ATHX7B7mwN2Q5l3pdv2LmWb15RuVXoEMdjWZVT3NbQyIodT0p2XiEFUVMOoDskDhhm1qLdErBiURaseg/mIfR35+C1umtzB7EwSwiex2Yd5mRMtX1HnMBO8y3cLr1YMdArjuD2I+aMqfNCzjXsjEZMUGicXSFer30I+KcuMti+TnlROCXJqJ459wVBaMjMNHtwplihZxERg5NNaWvGscI41rzkoFFOvSP2jcG88u5G68QVsPcBzSswfyDXTrvgloFf3QrJV65w6rstPoOrBxoHoNJx7gMb5moa5w1OW7VR08UIQ6BV3Jg6QiIXXzH4lywDHZA7dI3NhOiV+vRrQvDF8C6kJNoJnGsVnNj0ypHO8P5a46uqpUsQoz1LomZ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QjBvYlNjYkNNUlQvcXN1eHFvNHFuVDFSZUREaVRuYU9ULzR5MFhGbU1oYVNE?= =?utf-8?B?M25XOHZhdjVCdWE4RFc4eFExa1dGNStXVHFBL0dJdVlYTEFOOFM3NjhhTVYw?= =?utf-8?B?UHh1WGhHYmJtbU9lOXR2T25UQlRNTXQ1aXZuRi9INTlpbEd3UTc0NklaVm1q?= =?utf-8?B?RHVUY3FlL0dvKy9vM2Y1ZTR6WjZic0JSN3VIN3l5aHRORGs2amNiL0dQQVlx?= =?utf-8?B?clpHM1Z6WTBleHRIZnRXemdjZmY1Sm9ZNldtSGo1OEU1cFkvWE11ZTFJMUg1?= =?utf-8?B?anFLNDFLV1NYOGhxbDBNQ2JkRDY1eVVseC92VWNEMFNoRThNMHhmbXE3N1lr?= =?utf-8?B?aDN3OWQ1b1VmK0NIaUd3T0lubVJxQUpIa2FpWWEzQ2dnbmVKbGowUUpVRlBm?= =?utf-8?B?VXp0Z21lbXp0a0RvanA4blpxVVZZRmVxc3hIdUlpZFZRUFh3ZzVrTVNTNzYw?= =?utf-8?B?VE90WDAvenIxQUdsWjJaZHN4bVJsSU1LN0RoOHhMamtna2NDZG1yRTUvS3Fz?= =?utf-8?B?dU9zRmlUTGh6MVd0YmtzeUJTN0gwbWVzU3JHTC9KMWpPenY0cTBGNDlQdFMx?= =?utf-8?B?SGpRYkVQWWNOVHIrK05aQ2dJTHo2U1dlRWNpQk0yYzgrRmJhNkVtdUFCSEo4?= =?utf-8?B?TGVFYzFQUStBSVJpYy8wVUtvam92KzdzK2YzcGczalBEYk9kRXlPVlcwT1A4?= =?utf-8?B?TDFmMzdNUHIweWJLQ2hCMXArOXdrR285ZGVFSnJuckVjNkdLTEdSdTNhSTRi?= =?utf-8?B?ZGlxTlk3ODRGYWxZbVoxVTliMEZEN2MwSkdsWUJFVHhFVTRXUVJ5YUlxODg3?= =?utf-8?B?Z2lTVUk2LzQ0UzZyVjRGOUQzMjJFUE9ONnBOdkI2bEdMRllPMmplOE9VT0pk?= =?utf-8?B?N3lZYVkyc1EyRmduUHBlQjVvYUZYbzdlbmZwTVlhYnc3RDU4Vis1aDBpbTdN?= =?utf-8?B?QUk5cVJoZUl0OFVXSlpQcEtOYnlZVEhXUVdRUTZTRlk1RXBnR2dPYVpVVkg0?= =?utf-8?B?dnAzNG5RcFpWdkF3K0JWVTFGTzY0OENxdHg2V3lrSm4xK0VRL3RSSDNicjRv?= =?utf-8?B?clRyak0wclp6L0lmQ3l1bVFJVkoyREUySUhHQ2swcmVtZ3NTRFFTU245L3o5?= =?utf-8?B?a3VoeTdtaENvZEFIZ0x2alFiUHIrSlcvNnNwb3RzUDNWeFdhNk5heVdVa1k5?= =?utf-8?B?R1ZhMmlNNzZTbGYvYzZMRCtSVXFCSEFuOEdCUUFQSzBoWEdabmthVjFvUXJK?= =?utf-8?B?dXlvcEZPZUxVc2NQVWUwQ0c4Smh6MitDUy9PU2RrL01EOVdFdFBlZFJ4K01n?= =?utf-8?B?d0s5WXZyWnl1US9iUncxa3ZTd0lsdTVuRm1YWkEzOEs3T01oK3l0cnFwUGRu?= =?utf-8?B?eC9UTmVmb1hmTlJ1UTZHa0pjdkM0cGkxTmwvTjVXL1llb0ZnSjZJcm9tWEww?= =?utf-8?B?MFBKMi9QZ3RoZElURGdOOERSc0Y1c2pJaWpjOXVISTBWQ2lnN0t0MkhyOGts?= =?utf-8?B?MUNvU3YwTU1KdWZnRC9GRlJPS1QwVk11QlFqSVRTVXZrY2hYRGVyaXRSSCta?= =?utf-8?B?Znd5bzBpanhlTlFVbEhzUnRaQXBkZEliTHhwbWtNS2ZkOFRwR3BjbUR6UEJ1?= =?utf-8?B?U2ZVcEFDZk1sN3dlN0lTTEpGRmRJb3NpSTA1eXJUeVd5YTA3R0ptazcxWXBM?= =?utf-8?B?ZU9JL0U2dkVrRWxBZzdJb01MRW9ZZUJsT0RYSVZRRUtGRTEyL2RRUEZzRFh5?= =?utf-8?Q?0ioddyRut6Su+x4rigSfU+VpksJFBJGRZIXO3Rm?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 116c05eb-1a7d-4202-baf2-08da96b48c7e X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2022 00:52:22.4241 (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: DU2P250MB0077 Subject: Re: [FFmpeg-devel] [PATCH 1/7] avcodec/iff: Split extract_header into extradata and packet part 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 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: Andreas Rheinhardt: > 183132872a1d8bc8a32e7fd8f994fa2f1b2d6bfc made the iff demuxer > output extradata and made the decoder parse said extradata. > To make this extradata extensible, it came with its own internal > length field (containing the offset of the palette at the end > of the extradata). Furthermore, in order to support mid-stream > extradata changes, the packets returned by the demuxer also have > such a length field (containing the offset of the actual packet > data). Therefore the packet parsing the extradata accepted its > input from both AVPackets as well as from ordinary extradata. > > Yet the demuxer never made use of this "feature": The packet's > length field always indicated that the packet data starts > immediately after the length field. > > Later, commit cb928fc448f9566e6f6c28d53fa4c2388e732a2b stopped > appending the length field to the packets' data; of course, > it also stopped searching for extradata in this data. > > Instead it added code to parse the packet's header to the function > that parses extradata. This made this function consist of two disjoint > parts, one of which is only reachable if this function is called > from init (when parsing extradata) and one of which is reachable > when parsing packet headers. > > Therefore this commit splits this function into two. > > Signed-off-by: Andreas Rheinhardt > --- > Btw: Both of these commits broke API/ABI. > > libavcodec/iff.c | 116 +++++++++++++++++++++++++---------------------- > 1 file changed, 61 insertions(+), 55 deletions(-) > > diff --git a/libavcodec/iff.c b/libavcodec/iff.c > index 74ebddc621..4abbed8dfb 100644 > --- a/libavcodec/iff.c > +++ b/libavcodec/iff.c > @@ -199,11 +199,9 @@ static int cmap_read_palette(AVCodecContext *avctx, uint32_t *pal) > * decoder structures. > * > * @param avctx the AVCodecContext where to extract extra context to > - * @param avpkt the AVPacket to extract extra context from or NULL to use avctx > * @return >= 0 in case of success, a negative error code otherwise > */ > -static int extract_header(AVCodecContext *const avctx, > - const AVPacket *const avpkt) > +static int extract_header(AVCodecContext *const avctx) > { > IffContext *s = avctx->priv_data; > const uint8_t *buf; > @@ -216,55 +214,6 @@ static int extract_header(AVCodecContext *const avctx, > } > palette_size = avctx->extradata_size - AV_RB16(avctx->extradata); > > - if (avpkt && avctx->codec_tag == MKTAG('A', 'N', 'I', 'M')) { > - uint32_t chunk_id; > - uint64_t data_size; > - GetByteContext *gb = &s->gb; > - > - bytestream2_skip(gb, 4); > - while (bytestream2_get_bytes_left(gb) >= 1) { > - chunk_id = bytestream2_get_le32(gb); > - data_size = bytestream2_get_be32(gb); > - > - if (chunk_id == MKTAG('B', 'M', 'H', 'D')) { > - bytestream2_skip(gb, data_size + (data_size & 1)); > - } else if (chunk_id == MKTAG('A', 'N', 'H', 'D')) { > - unsigned extra; > - if (data_size < 40) > - return AVERROR_INVALIDDATA; > - > - s->compression = (bytestream2_get_byte(gb) << 8) | (s->compression & 0xFF); > - bytestream2_skip(gb, 19); > - extra = bytestream2_get_be32(gb); > - s->is_short = !(extra & 1); > - s->is_brush = extra == 2; > - s->is_interlaced = !!(extra & 0x40); > - data_size -= 24; > - bytestream2_skip(gb, data_size + (data_size & 1)); > - } else if (chunk_id == MKTAG('D', 'L', 'T', 'A') || > - chunk_id == MKTAG('B', 'O', 'D', 'Y')) { > - if (chunk_id == MKTAG('B','O','D','Y')) > - s->compression &= 0xFF; > - break; > - } else if (chunk_id == MKTAG('C', 'M', 'A', 'P')) { > - int count = data_size / 3; > - uint32_t *pal = s->pal; > - > - if (count > 256) > - return AVERROR_INVALIDDATA; > - if (s->ham) { > - for (i = 0; i < count; i++) > - pal[i] = 0xFF000000 | bytestream2_get_le24(gb); > - } else { > - for (i = 0; i < count; i++) > - pal[i] = 0xFF000000 | bytestream2_get_be24(gb); > - } > - bytestream2_skip(gb, data_size & 1); > - } else { > - bytestream2_skip(gb, data_size + (data_size&1)); > - } > - } > - } else if (!avpkt) { > buf = avctx->extradata; > buf_size = bytestream_get_be16(&buf); > if (buf_size <= 1 || palette_size < 0) { > @@ -273,7 +222,6 @@ static int extract_header(AVCodecContext *const avctx, > buf_size, palette_size); > return AVERROR_INVALIDDATA; > } > - } > > if (buf_size >= 41) { > s->compression = bytestream_get_byte(&buf); > @@ -449,7 +397,7 @@ static av_cold int decode_init(AVCodecContext *avctx) > return AVERROR(ENOMEM); > } > > - if ((err = extract_header(avctx, NULL)) < 0) > + if ((err = extract_header(avctx)) < 0) > return err; > > return 0; > @@ -1525,6 +1473,64 @@ static int unsupported(AVCodecContext *avctx) > return AVERROR_INVALIDDATA; > } > > +static int parse_packet_header(AVCodecContext *const avctx, > + GetByteContext *gb) > +{ > + IffContext *s = avctx->priv_data; > + int i; > + > + if (avctx->codec_tag == MKTAG('A', 'N', 'I', 'M')) { > + uint32_t chunk_id; > + uint64_t data_size; > + > + bytestream2_skip(gb, 4); > + while (bytestream2_get_bytes_left(gb) >= 1) { > + chunk_id = bytestream2_get_le32(gb); > + data_size = bytestream2_get_be32(gb); > + > + if (chunk_id == MKTAG('B', 'M', 'H', 'D')) { > + bytestream2_skip(gb, data_size + (data_size & 1)); > + } else if (chunk_id == MKTAG('A', 'N', 'H', 'D')) { > + unsigned extra; > + if (data_size < 40) > + return AVERROR_INVALIDDATA; > + > + s->compression = (bytestream2_get_byte(gb) << 8) | (s->compression & 0xFF); > + bytestream2_skip(gb, 19); > + extra = bytestream2_get_be32(gb); > + s->is_short = !(extra & 1); > + s->is_brush = extra == 2; > + s->is_interlaced = !!(extra & 0x40); > + data_size -= 24; > + bytestream2_skip(gb, data_size + (data_size & 1)); > + } else if (chunk_id == MKTAG('D', 'L', 'T', 'A') || > + chunk_id == MKTAG('B', 'O', 'D', 'Y')) { > + if (chunk_id == MKTAG('B','O','D','Y')) > + s->compression &= 0xFF; > + break; > + } else if (chunk_id == MKTAG('C', 'M', 'A', 'P')) { > + int count = data_size / 3; > + uint32_t *pal = s->pal; > + > + if (count > 256) > + return AVERROR_INVALIDDATA; > + if (s->ham) { > + for (i = 0; i < count; i++) > + pal[i] = 0xFF000000 | bytestream2_get_le24(gb); > + } else { > + for (i = 0; i < count; i++) > + pal[i] = 0xFF000000 | bytestream2_get_be24(gb); > + } > + bytestream2_skip(gb, data_size & 1); > + } else { > + bytestream2_skip(gb, data_size + (data_size&1)); > + } > + } > + } > + > + return 0; > +} > + > static int decode_frame(AVCodecContext *avctx, AVFrame *frame, > int *got_frame, AVPacket *avpkt) > { > @@ -1538,7 +1544,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, > > bytestream2_init(gb, avpkt->data, avpkt->size); > > - if ((res = extract_header(avctx, avpkt)) < 0) > + if ((res = parse_packet_header(avctx, gb)) < 0) > return res; > > if ((res = ff_get_buffer(avctx, frame, 0)) < 0) Will apply this patchset tonight unless there are objections. - Andreas _______________________________________________ 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".