From patchwork Thu Sep 23 15:28:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30500 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp567179iob; Thu, 23 Sep 2021 08:31:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytZw7eaGLFZiN5PmSjqmJRQziwR/BYA7UOKEmwuZG6s/zxKzxZpt00EfCzQrpBW/BwMOu0 X-Received: by 2002:a50:da07:: with SMTP id z7mr6109323edj.301.1632411071280; Thu, 23 Sep 2021 08:31:11 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o8si6466048edi.429.2021.09.23.08.31.10; Thu, 23 Sep 2021 08:31:11 -0700 (PDT) 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=Yt87kfyO; 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 0227A68AD88; Thu, 23 Sep 2021 18:29:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065106.outbound.protection.outlook.com [40.92.65.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A91E368AAD8 for ; Thu, 23 Sep 2021 18:29:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NrLHNtp/DvS9+VUN7frwRleWmuUIzCe1y+wnqxtyj0eNJXdaEs0M/YtbL0sjsnnn6GcaNkH17EUKsbGRU70oANj9P+BBcY9GkxZzYZfnepWBEED7WYs95j0l7yo6CIHicCvbmXApmAMVW4/l483S78YZwVv8bkgglrI5vk3hSA+u2pZAL/wBS4SL3RDtM0r7WvejliCPVq7FRcMVctvDulynPfIPuL8PQY7tfDFfEoBqFvpxhhswgASNtwN2AmkTjMFnKQVQcNcraGaCReb6NKvwXiVSFykErSehJ5KGEeTKtZWy1rpHdaDN6V07csFgEcdUrgME9xdghDbWAJ08cw== 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; bh=QsR9udISBxDgaI47z+KTMmvdccWrQzOHqBRJNOdjECI=; b=D0Z7WAAmB/eij4jSMGQ61lH4H7zkyfsLGSqGr+FKG7byJbddyCR0332ObJA4I/vvWgN+7mIJ5voguW0GtelNMKzc2fLikuA23Y5iC0XSe5dOkYCAu+Zr+SNdtg/AWiNqC0qM2FBeKyfl+0B1Z/v2OWms3UwARAPw6Eb7S9ErJpViOpXj+vgy52OW17i19FiEciRRzLf9tM+CzS1wCrljH3qfe+Y33VjB93NM8j10mFERh9EFGof6mydVldaCoPvvuGTLGPPlh+zb8Tkl/Sf7Jeom7jdu8xq+cOpuaw+mAMALv6bbcu9a2skYwa/Iwtfc2nFA1KcY+6djYdwOojcuFA== 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=QsR9udISBxDgaI47z+KTMmvdccWrQzOHqBRJNOdjECI=; b=Yt87kfyO5bpcVjoLN719GYOFW9yu5KfaW8AdX4vnS0hB3u72Q3PksBj1Or1I89c8P4Mr5cOHPmxcOO3GaU34PXTLhgk0Frlo8VDzlZbTfcOJzVzewSYGuSkMzlBXwoTIlWghT9zhv1UJ7MUVOwgANgqkO/Eu1GtG5HwUnE8w4PFB1cE/YPzLpFbnUheJFLyBdOWyJQkcAMZaEKqAgsl6nRMUWBxVl+7zffkKffeI23z5+bOYoq0QnDMMb3UXDWW6UBwteSBt4Us3myTTS6rXcCN3v9qO+5wukaK2IlLbNUFCOZdA6WrSYLOQ+CMq48KKEUh5TbGyzouoZaR2TjT7fw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7061.eurprd03.prod.outlook.com (2603:10a6:20b:295::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 23 Sep 2021 15:29:34 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4523.021; Thu, 23 Sep 2021 15:29:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 17:28:46 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [pZXNZt+ea1mQDSjRKEmulYkHF7OYTlAj] X-ClientProxiedBy: AM0PR06CA0106.eurprd06.prod.outlook.com (2603:10a6:208:fa::47) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210923152902.42865-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR06CA0106.eurprd06.prod.outlook.com (2603:10a6:208:fa::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Thu, 23 Sep 2021 15:29:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 927b4b71-9e5b-4436-59f3-08d97ea6f1dd X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSygBPrM25OmITrtIHMJgdSZqMZngPo3ifBJAJOclmf1kIzhQHQZ0qs0yE337EHGnVvu/fBL22IJ694gKjXJXBWhbf3WsNyyLvZP6/UoAL9/djgGoqAs1kCsPYPoN/rqM8fw7fjI6wHdaBJjtwu2EUnc09VmZxXQjZn6UV/MOAKa1I2KGBvVye+u/DMGJx3dDsa0fXOmda6W9OWsGfYeZfqOucPqN1BECnEBuAVNH4CCgKLUpCgd926yde0XBmbZ109XTzKskKjA/8PKMVSnGGSChHhswmi5PyfB21oUtHj3nEYdqAqNpo/nyv9FkCLcszdgi4ybq70yn+OxS8pboquX0ScKwwjxgLEW8kzMxCcrnl01obIycRDV1QJp+Pkd7h8VmGeH26WD9oaBrhJGiZ+fsdgnV8XPK+TImCFaf73vp3Twzof+bqthYZH8UsPeLU+SyfBRf2fUvj5BrSYxCF2YDi7dRcdtktoz3vZBY9/McNYH3B++V7zAIu4oXZI8rsZuUiXkYK87X8l3wbYM5pdK2x4/ncVQfAs9PIoRlnWjSude8bP7JzVtI3iQZZ7/3W4PnwQ6qnGAy5IgT3974PAbeiMcwhWzNOgXVwjOZNTDVQlgYcJYUx4lRX/PmEmRrE0334+nr1c2JNotHCBiXYqivvA89ZvHiEl9iUl9mOELfdZCIKXesmPBEGMhEGbgylDXHHYRLZKDxFpQs4aKonGmllvqai3nSv953dHjY2x1eqbMvA0/VKPhCT0oGhrnHU= X-MS-TrafficTypeDiagnostic: AS8PR03MB7061: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ESBKVWIySWPmNn3jRHXW4I5c5Z6e4FYAJHdmG+qxf4LZ1ddRQPB7V605f1Sv3vXjHxZNhjAQaU2C11CXbGFekCYGnb25JVJ2ijmroYZ8hty2oYEcUVEvOX3G8u/bwntYq4xFxuNT7Q+fUllVKBtilOAucYWS941b+2uQE0NBcmYN1J7oi2A45gaTeVcJGezbfQdBd44BFZ0zljv6HEROBP4ySdrfzvVmLQvvxog551gVpapJJ9/PZi8DgDHZDgkmRP1dNtL2ZqK48q5B6lNfJF8lrSF/kNRFEu6GD+P0ogHMNvc0JZaU5VJwuyxbOPLIsJ/Zj0QRI5yjTi4YYDODP8yWvUIrtPtYlxYhqHR6X5g4oZ9piGYjZG89nMtRfS7BF7ckrZzZsAyd2tQvr4wHgnxMSdcj9lzZxrK3NcCL5d5VUHXy/tl1z1jEBrDQ0aD5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ToLhTrNoHWSNd+kjQamgQRBp0h6691fuWVE4jnyz5GFMqbaQuOoddJ+41+1IiIBjyw8bwo4bAx1srWfUfYnWNRFoywcNoor/PLtSJ/+qPs0LQcUCOTkSNennWurxyx66gE7/16sy3+0KY/KnfS7KJg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 927b4b71-9e5b-4436-59f3-08d97ea6f1dd X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2021 15:29:33.9282 (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: AS8PR03MB7061 Subject: [FFmpeg-devel] [PATCH 11/27] avformat/icoenc: Simplify writing bitmask 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: /4KZYUgLuboZ Signed-off-by: Andreas Rheinhardt --- I am pretty certain that the size of said bitmask should be (par->height * par->width + 7) / 8 (or maybe par->height * ((par->width + 7) / 8)), but not what it is now. libavformat/icoenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/icoenc.c b/libavformat/icoenc.c index ee793137fd..21966f3921 100644 --- a/libavformat/icoenc.c +++ b/libavformat/icoenc.c @@ -31,6 +31,7 @@ #include "libavcodec/codec_id.h" #include "avformat.h" +#include "avio_internal.h" typedef struct { int offset; @@ -119,7 +120,6 @@ static int ico_write_packet(AVFormatContext *s, AVPacket *pkt) IcoImage *image; AVIOContext *pb = s->pb; AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar; - int i; if (ico->current_image >= ico->nb_images) { av_log(s, AV_LOG_ERROR, "ICO already contains %d images\n", ico->current_image); @@ -150,8 +150,8 @@ static int ico_write_packet(AVFormatContext *s, AVPacket *pkt) avio_wl32(pb, AV_RL32(pkt->data + 22) * 2); // rewrite height as 2 * height avio_write(pb, pkt->data + 26, pkt->size - 26); - for (i = 0; i < par->height * (par->width + 7) / 8; ++i) - avio_w8(pb, 0x00); // Write bitmask (opaque) + // Write bitmask (opaque) + ffio_fill(pb, 0x00, par->height * (par->width + 7) / 8); } return 0;