From patchwork Mon Apr 11 23:50:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35269 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp1303828pzh; Mon, 11 Apr 2022 16:50:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0QpEz71zmDrqvzoWP38xphbVmED99VXlpig9u1B8jBqCorV4heI116ZSeNIqPlkEMM6Mu X-Received: by 2002:a17:907:6e16:b0:6e4:de0d:d93 with SMTP id sd22-20020a1709076e1600b006e4de0d0d93mr31975255ejc.29.1649721053455; Mon, 11 Apr 2022 16:50:53 -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 do4-20020a170906c10400b006df76385cfasi8618443ejc.410.2022.04.11.16.50.53; Mon, 11 Apr 2022 16:50:53 -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=I9WqIn63; 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 4EB0C68B351; Tue, 12 Apr 2022 02:50:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064077.outbound.protection.outlook.com [40.92.64.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 90E4C68A43D for ; Tue, 12 Apr 2022 02:50:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GQi6uENrEf0h0n+ogI0zdu3LyvWl0ktUuEiXQn4586BuUlfHb97v1erT8g3o9YPPekWIpbO+CP7kqCYQznFsvALXFlAqOnjsBRoKJ6GIWwall0BYZoiULF7VIsM8zM6E2LUB3z5BEH0Csg3sUXSkZc8lfJ9wDxTDdaN8WefQg2uaRAL4rF1nLEFEUoIaIqsY2dFu3+iYruM5bGHqFVJgiFJYy4ivKQkyGiRLwBAun2wKu+kMMnrW9UOMRrNa2jlIlDAMeamyFQskVbZstCxU5tCANVv1ZYDMtSj9YPEN5twjDaj4KFfg1ugJJzBCdHOTU8VO1jBnEUF5aGLE95qIKw== 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=2hh1B/u7reltrdldvu/op8RRRBZEBsrd2Kvv+zVMZ3M=; b=G1fyqRpsiwWcLNBMDINhf3NcoJ7hrXi9no0dsmGpWyy7YrXTbCmoslgUlz5dLvRViA0AQrZkbpOnSHcfUohbA6M5qtTDxkTtyUxOkN2l8npaRD2TFe8m6SokJlutw62nslnFT16wo2Kcz8+IC4tz8OYhNtFq7MsfJWMCRO2LZBaWj1UIL4ZvAsL19EOrcL427DCLzBzllXgX5G60U++RwjtshjhH6dJaHcd6sD8RZtXXlbw4TFswwh/4XgURKoQSrgb30O/yZ06WIS0tL/fc5yJvpj+U8gDFx3RMQh3Etu5W/1sBOrwQJJDmPmO59VIGMQcioJ09EtdS0mGIPH1hDg== 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=2hh1B/u7reltrdldvu/op8RRRBZEBsrd2Kvv+zVMZ3M=; b=I9WqIn63khBR/hksY/2dXZ5nlQoIJoHSG3QN71YPVxx6wQ3r6OShAXuEXimIjodyDby9Wt1H7CiWcF8+OrqrkVCzxRCBHz5Ic/HI9YDJsRoq4m9df9mJ4d+Tc+aI1S/Y58mk2w7MD8jyGZERqLoPQPLLJwaHyF30blWa7tBZy14TU6vdUq5A2Nzo7c2SoBr6whvjDFIBBltKFKDGmoHzaE8err9fopM/LPEAcI/SeNL4gXQXFBHSi9cU3C+pKPo9i3yG37fJmKti2kYe44SFnz+v6wO/RInTBgnzTEa0FaauV8EHapwMSUs5kuguQW6UZ3zd5M4DY+YBRkUWe1e4fQ== Received: from DU2PR01MB7950.eurprd01.prod.exchangelabs.com (2603:10a6:10:239::19) by DB9PR01MB9977.eurprd01.prod.exchangelabs.com (2603:10a6:10:300::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.19; Mon, 11 Apr 2022 23:50:28 +0000 Received: from DU2PR01MB7950.eurprd01.prod.exchangelabs.com ([fe80::bd41:5eb6:c582:c000]) by DU2PR01MB7950.eurprd01.prod.exchangelabs.com ([fe80::bd41:5eb6:c582:c000%7]) with mapi id 15.20.5144.030; Mon, 11 Apr 2022 23:50:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Apr 2022 01:50:17 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [3t6O12DMOoI5/PkMKpVkdyx0ank01SaC] X-ClientProxiedBy: ZR0P278CA0060.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::11) To DU2PR01MB7950.eurprd01.prod.exchangelabs.com (2603:10a6:10:239::19) X-Microsoft-Original-Message-ID: <20220411235017.316325-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9bae4b82-72bb-4b81-e920-08da1c160e86 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiThIBhrdRr4cDPWJ93ZpY+lBfiehFlS+IZzO0JV7Os/I08qxkjnC+pk+vK8MmeCdRvx65xYbph+HHTvz33tzmE1wzwbhbWCD80WjSjkohdZ1XUQSEmogAvLNSf3YcBkivyNGCuRRCclI35BoXOx3LEZooKB1Cfh+a6c/9tUApnFWdQ4pFuf5N0mJy1S3wuNiTx8HNUcy5vprSboniAShPbbwGCVBw+A0GuDlTGsdfVnCDTul+z75eUPepUh/iSRGKJCCfjDKgY9JSlfuIuOZ2vXzuwmklX538K123zmGq2Sr0fM5AAWHci2UUq2M+w3gkvLCFphaqDWbWw1zpBWni9Aqr0jVuecQ5B4/GdqJ3CD8v2qsMoIJ58M/p6cxZOhD7q6vxL2piiRPaSB1mh5D73L4b6dzVuFjEXNlVv73xbKiJrGGkZsMV+9bUyUBafDkGlOMoQ51R3yzoTqAVhrD+0A05fhIUphHTIBTzThk7/XBoyU5VUUKQJwQbJ9IthoXucGCPrwyYoFtLZvn1I2mq6zDClGoeLtqoHtpUC3mau0jyExWK2enso7zVrlxL0If/DbV8dT5VtbjWHB2ZPoUXOBMj2dM9onVYa+nhs+iht0Uak1vV6zffY8AVHeRhjL5vaxDrAiA9Jvpaxcfj64O+iG+nKoWeOw9cy2T7Fp74tStNd9p/tWk9QWx6yGKYRr+oS604jpU0z7XOCUElcKZlx49C868F+ODJqrriOi1swtlKD5X+88wnA9VH+t7ZWJOp4= X-MS-TrafficTypeDiagnostic: DB9PR01MB9977:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SvtahsqZlghwC3rBCmZUWJ0ItDxQG8xsEaF6+VdZWYG+MvWvYl96lgibXrOknyldWlez414bFesvsjExX834XeboVylkt+if6Ri/8m832XXpUTjjWdEXrL96li/YSblEAUC1GR9YDuzbgFP33lSwlsWXoAD5O/8tCSlWD4qdFcmUSN7tmtgNRloShQaEmMFHCEMrXhijAce6OsqI5QN8eN7qy27TcqjlK5mv4aCdZA4Q9tAOWlFkXG4I72h4p4lcXpffzkAnxJEPyQw8CvJCfTyJ09qdNsKlbFSxtDbsLGrfsmu6ZNz9BQsJTuJ1KySsyk7+oOJXSDNtc3rorzsTUsyb3pWtMIg5d5GM+KJtoXgY53xzixK3rzOjA603oUGW5kRYRMLDFQ4M/CjxnQEWsSXlsMsnMq4oU3MfJHuS+F6naGgX5q2/N+Uf0xXywQdEYyHQcqwA5ZVRBZ8V0UPgVX7CwBjLAgfy8D9OEQKEi7LwmRcAAOTEQLwr2fUDPCYr0FNlG4p6BmcnoDlvdaiYafzP1JzzsOc5Qnea50GZxYTEOSiI1yu5HLOM5lfM4/hTwkGWZGm86USq93Zgv7A4AQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: A/kb6u7SczmLsGI/bVJgmakNyYqFKvVR4BtAwDGGaeZY5iK+7zL60lPJUrgfZ/TQLRI+5UcJwRC9d94ku1smYhbSXiicqBy6amES1Dn9Gv/oJfDjsjberdNu60Wt3itVJi/ASqaweaL1LsUnyNpfOe6fZNl+A2yZ0N9BP8UmFT9uFwbKPYaHvsIsCRcAw9myehPEP8P+nGYqZksQxkSzXS2yGr1q0E5k6/OPOVQ9fkp9eUs+iJf+Flfc72DIpgAouXCDFguaJxd9mesGZUWb4IlEpwEFQInQQnCp5OIbZfPm194Hd8K2eXOxA1etM7006Rf7cMTBhRISoPEn+dJhNfosj0KRDv6/ELZo2IxoQB41c0xQ79ML+dlPm5Dc7AaKGaQq8XC+PCieWLB0jad+vfgCneM/Gn9ektBYCzCxNnD2p6e90P6Xi4Sjp7hj1DiZphyzVD/IFmLkXoDa8Zhx20H/S3qr1dN1enPQppjY93bhxDU3VBwnvwQ4yEbRvBqtPCqttK9Wb2Sx4OZfWSMfYAhhFiho3x/ongM+lDzg5OOFB1e14vj/TKDgrm+lTTGtXiyOP0BuHLs/nPT+Uu8xAYwPw4tJ5ECGK48XuMbb1qRHD9mK1O5TjAzzl6y8XVII6xlThsnH3JbbfCvU0wA/+P7YYmWL15nCIw9DemxCv7DKI/8W0JmsfycBoD0ytMWUZ6G1sHeqR57Etf/EuIdV30vCOJjE+OgvdQHutYRm8Q7R84dNq9PuzehRUM0MXvpsfzwtxUspczpDyQd88K2bvuJMViwLVTMxKSpEpVgJikXaarfdae8H0hyJQxE85/x9Y6y85WIJZUjxElHS9r6xudYl9q83dydmqkZtHn4UDlFzqm30HwANMPzjejQFV8zlevX28FNIW+Nf8HR66yM1dy9fmtjnQ64GcmYrbcdv7Ct5tHP5qODWM1QDHYHTp5DjmWHXtSwtQrgmVLuJP/S+O6Fl585h14/H3ZgCKKb4AmrXE/ZYgbsXPyGRi00epQb7+/AmU5Sw1pCDx+e7xk7O1BPeaTkD+GfBLyI6M6rK6IrCiqkHMvfSeCsfo4NY33GXgfFh5mOfarzWvXQkW+M57bHTSz3vFoT1JU6mB0v6GyDpMUVGEkz1zdp152CavC+PxifYo6YkfKQpUx9EmWCMVcFQ4/Z33YoKJgjpQIt9H4E7pUFMgv/GgMjbPEqKs/v2KUYMAf8iOLKpkohdlQMdyH/S7vb0tqAlH0aR99Ru+km+IZ7MDYqDV5vFnzkl1YnO2Lw1NSp5Qn7nrEV74tEtVNLnBjlhBRcAjMWxhTVEhzM5GjvqgWVrPY33vuCmn8cONvksuJVs9BVa1/QOuD/tpJOLdcHoNbe9g0KRPmVOkB5pM6xNVryUV3VNP00ox39J4eyx53mZMv40XzkZVTrlGQnZIu62ks1m2dB44xxek19PVA8HuKcjA5rMVtiVT86h X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9bae4b82-72bb-4b81-e920-08da1c160e86 X-MS-Exchange-CrossTenant-AuthSource: DU2PR01MB7950.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2022 23:50:28.7739 (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: DB9PR01MB9977 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/mjpegenc: Don't unnecessarily grow buffer 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: ZwUFZCaapdbo The size of the ICC chunk has already been accounted for when the packet's buffer was initially set in ff_mpv_encode_picture() and the header (including the ICC chunk) has already been written at this point. Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegenc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 1e9b97535a..8cada8366c 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -131,7 +131,6 @@ static void mjpeg_encode_picture_frame(MpegEncContext *s) } bytes_needed = (total_bits + 7) / 8; - ff_mjpeg_add_icc_profile_size(s->avctx, s->picture->f, &bytes_needed); ff_mpv_reallocate_putbitbuffer(s, bytes_needed, bytes_needed); for (int i = 0; i < m->huff_ncode; i++) {