From patchwork Fri Nov 3 16:11:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44498 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:181:818d:5e7f with SMTP id q28csp661756pzh; Fri, 3 Nov 2023 09:10:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEpiV9Mnagl87Y0NVC8j1F065PJnI0tvhZFQupUxILUnnL3Sf2GCfZeXT2xY+that1B/yHJ X-Received: by 2002:a17:907:1b02:b0:9ae:82b4:e309 with SMTP id mp2-20020a1709071b0200b009ae82b4e309mr7816013ejc.0.1699027809043; Fri, 03 Nov 2023 09:10:09 -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 wv9-20020a170907080900b009cd4b465082si1163894ejb.831.2023.11.03.09.09.57; Fri, 03 Nov 2023 09:10:09 -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=aRo8bCXW; 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 07EEE68C961; Fri, 3 Nov 2023 18:09:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2042.outbound.protection.outlook.com [40.92.65.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D1E268C961 for ; Fri, 3 Nov 2023 18:09:48 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Kg8dGQK17y0s2FQwVqrc/EjvTARI+0IecCEWqowIBscFnUEXFecONIQDkWmuibDWUl8b4QTLxa7PQ4CYSRlqRHcjeYZSLOe4hRinybdmwCS0SA0GZFgSj8Dq5X8DOY4+6pt89xx5Gyx5Xn9o2jmIz/5b4IP5ZPaQXP/3QMXHFt7qsgAQzUPb0CK/PIPYkD+2txR4lc/zznJb9H9tVnMFkCC0k46hqTdNCfoNIUFk70ERJ76NZ+SlHe7T9axvwIqZVeFa695EcbmK3GjR8azh/RCdAYUWHLYx8aqo9zyOV5YrgQ2oRf+7/wL/im98eeaogbEZYDhHXqYBzBd1XcWqMA== 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=rcsIA6ST6cd12vtGU7XE6qTPlXTyBeVtGdFqLrUPmMU=; b=RPLAx9N+uwIkeTJwqkLpJ/LP4br4Onr4O08TjSD1iJC3du3njpp+kBxvOi/986vnNPdIVBW5gRLVUsWz/ozUt2pzJBs4pddum1VY0T98iCQs3jD5Cu+HkUWv4p2FQKyTzAiKJ+5GPB8AMgumiu8T/Z1a5uVcVbmgJyXfoCdtCA9wPgQzc9jrtuaTEBpbRk913FuLNvxECaLqdOzxk2vY7uvsjQJpsalgFXPx9e8pQ3nsWsDDfN6cCyX0wWiNokMVtZzh4+dKTXG/kwqbNT2rM4RF1GQ53jo379FcvKZvE9gYVPn9T8aOMN5OsNph8yYEJG1eEk59X4MDb8IF9SoE8A== 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=rcsIA6ST6cd12vtGU7XE6qTPlXTyBeVtGdFqLrUPmMU=; b=aRo8bCXWxW/ERRgHTmAt2t3SyN9wus3sH3nqjoupDf0MfG4cgGYrLwp4m9YSbx5xathjp9tWsuZmetfEtpNTW+r5nXqFGFW4lDdAzTC94wIGy0vrIv531nLtjzwAWL0TnQ/e7XprSC5ZaaRzWZXtPPH/cOVo4sAGgo8knGKCTPMxoaVRfKvBdoFAAwlAyG3EOzswnImA6IFhAginu3+gfTLwwFCM+Zz0Dop84KgtZxCaHDJHmvPzU0EkLkWyuTc3nlzTMIVJgBl8FILAcJbiZm5zf5GLvM/EcAQAVnCFNteRcGgiNv+LaqH4z9wuTnobMFOx0gFyJEUcA8PZswFh9g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0331.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37e::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.21; Fri, 3 Nov 2023 16:09:47 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f59c:9cff:a42d:bde]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f59c:9cff:a42d:bde%3]) with mapi id 15.20.6954.020; Fri, 3 Nov 2023 16:09:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Nov 2023 17:11:00 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [rEZEXnEKd20RfH/rGx8E26f9qH9G6qxqlVwDwT4RyLk=] X-ClientProxiedBy: ZR0P278CA0104.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20231103161101.81135-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0331:EE_ X-MS-Office365-Filtering-Correlation-Id: 6fb65bb3-9dc1-42ee-c7c9-08dbdc874ca6 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jc8EX9nY+r2FmscxcY62p/GvCYcePpYnCzvB/d926KtjwHbd1bhoxhzY8EuuDrlqNG93zSXqyeG3URowwuFy+JpUsZZbbbB1C2mJJcy7GZWLG0QNytjb0ohjaL1QMjan0NN5wm0tP9/z+qHPqlEVEykcSs3o6coiLrdim82FwIg8y76lXY4yHaUmXhAmBUeg+DSkZmhxRF0+d5A66Gep/joGCIq41iHBgwM/eqG6+DHLjHus7RGctRWApEztM3691obIL5AjXRIM3ZY4YdEP+kHpfJrxKW2PRdwh3yaNifu+yp1Ih1PAi8V35B/dOsodTDNibFi/7N7eWETGQeLPnLOx0wsxUUJH5nycMgCg2OKDhcuhzeisU2q+uyCTZopIHGKb8LuC4BIFlWjgfUChUGv0NrdlRT1iXZv3JOTkHp8WjxAhB753IQnZqJD3XRqBzCC8avJzxPNgcgX6yNVf5NnWYOpkJo6Nfu6Y46GZwNMlwbQmUxxCOHsc3NM9S7SA94DVBGlWJoz8Kt04/mthQ2plaYtGm8qDB08zLiZSgkkQ6IFddUVwDzWzqZPCXmbPtasI1oTne4+VLI1ak/udcvetQTQUlPz4bzugJdY+Kbn3b7DLm3R/KsBWRpWJc4aS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KnF5l/HfGulJzua6cwQGX9TlaLFIFAWZE8USwP+ngfCUViOab32k20RO2isM72PpxmdeK00Bxg6y7TiMLWMYrCVemAyXzTBMAAZbLex090mFhHNHsyDWVy1rMoL769hjVEMoauFUUWj6Y+XzI3lLEVbBzz7Kb5qo7KHFDCpSPrP/uQQMAw+0Q6PkrsXE6ikKXMXlcOYDYgmVALJ0Zm7Y6RlMSY6/J2TMwGWvQUzv7YZFxLb5ZuDdkAqWWyBqyTamoJwIY0ZQ+ce2s6kvQBh3QsqU5annq1GJRKDyuStGVLiq4vSZAqNIOlwB8oME7Thi38b2rjDiPRifcfUTPnMgWT8wnWd6lbsYvh01YqwKHCLNBfgHmaYDmxFnbdjan/SkdFvR1YquP2HDM9gVApVo3OgG+5eT98+jDDNYE2qQdHPT1zCBFXQiYZjqPG7sKgpCHaQhtg4OGa9rl10JUYcO1w2LzmkzKyUgd38I2gwsN8VSNqDuTz78GvmKLM8m5ZRSUT4URU+LGv5ya+2IMzqiyLpkVH4g02ArDC+r3M3H92WafFn15U3rJAL0A6lyZl6JQPEaXqEWuc2RYHoIpE+0eBVNQhFyOLXOr/xHFy5OWnQfj9BrU94e4YtD5ZpZfR4sXmkkp2fLNz3MIHPujcyakYW2RInHBQVXfoVMAvMblZolS/0d9KlI7JsGTrgrz3VAiYO0QN+iZojTQKOi8tocZMUYohgQkepLkECRxWF2RgglbQC43T3ruaWPDWTxs23kDBDlnmrtey0F//VrkPZSaN9TaUuzJ1mTomzHx/WZym9D2UWnSs5qmVQNLkQaC9H40eez38vu+zLG8zDa3NwlPbCGrJB2QhzFGjHo4JovKNUN850fbh4/h+ZzNcDGCLF8NrCoBqxJML6X/Oe94X/Qz0CrV92Ssou+c50PmDccnLm+3z/BVxVy7bfqS8nmx91EJR3WpVHIvIR2ybjk2C+uPNKqB0I4RGcsZeEkiaRrOzz791AwMeXoPZmjWC09EN8WAQ56y0VodF5a1XU9yMqXR/Z3AlXh97mXdL0y840CjBGQFvtV4bwXw93aJp6A6OlcDecbcUqzDaBGLEqDYmXJoNNugncdM9qnePOR+WNJ1iSVF2NO3TOHRndChw6ofvp6eDGhwR2DTV7hJG4GKdsYRZP0oxVmYzb31MznGWrkHWwSm19jKdE602vy90sMu1DcIIG5bE4SWH7anvC0CWfBrEk8rVdLNL1s24Ya30gwdjwGowAi9kOslLNDyCg4tUp8 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6fb65bb3-9dc1-42ee-c7c9-08dbdc874ca6 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2023 16:09:47.0363 (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: AS8P250MB0331 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/webpenc: Reindent after the previous commit 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: DsB66Eut8jiS Signed-off-by: Andreas Rheinhardt --- libavformat/webpenc.c | 94 +++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/libavformat/webpenc.c b/libavformat/webpenc.c index 9ac353c967..d4acea7ba6 100644 --- a/libavformat/webpenc.c +++ b/libavformat/webpenc.c @@ -80,66 +80,66 @@ static int flush(AVFormatContext *s, int trailer, int64_t pts) { WebpContext *w = s->priv_data; AVStream *st = s->streams[0]; - int skip = 0; - unsigned flags = 0; - int vp8x = 0; + int skip = 0; + unsigned flags = 0; + int vp8x = 0; if (!w->last_pkt->size) return 0; - if (AV_RL32(w->last_pkt->data) == AV_RL32("RIFF")) - skip = 12; + if (AV_RL32(w->last_pkt->data) == AV_RL32("RIFF")) + skip = 12; - if (AV_RL32(w->last_pkt->data + skip) == AV_RL32("VP8X")) { - flags |= w->last_pkt->data[skip + 4 + 4]; - vp8x = 1; - skip += AV_RL32(w->last_pkt->data + skip + 4) + 8; - } + if (AV_RL32(w->last_pkt->data + skip) == AV_RL32("VP8X")) { + flags |= w->last_pkt->data[skip + 4 + 4]; + vp8x = 1; + skip += AV_RL32(w->last_pkt->data + skip + 4) + 8; + } - if (!w->wrote_webp_header) { - avio_write(s->pb, "RIFF\0\0\0\0WEBP", 12); - w->wrote_webp_header = 1; - if (w->frame_count > 1) // first non-empty packet - w->frame_count = 1; // so we don't count previous empty packets. - } + if (!w->wrote_webp_header) { + avio_write(s->pb, "RIFF\0\0\0\0WEBP", 12); + w->wrote_webp_header = 1; + if (w->frame_count > 1) // first non-empty packet + w->frame_count = 1; // so we don't count previous empty packets. + } - if (w->frame_count == 1) { - if (!trailer) { - vp8x = 1; - flags |= 2 + 16; - } - - if (vp8x) { - avio_write(s->pb, "VP8X", 4); - avio_wl32(s->pb, 10); - avio_w8(s->pb, flags); - avio_wl24(s->pb, 0); - avio_wl24(s->pb, st->codecpar->width - 1); - avio_wl24(s->pb, st->codecpar->height - 1); - } - if (!trailer) { - avio_write(s->pb, "ANIM", 4); - avio_wl32(s->pb, 6); - avio_wl32(s->pb, 0xFFFFFFFF); - avio_wl16(s->pb, w->loop); - } + if (w->frame_count == 1) { + if (!trailer) { + vp8x = 1; + flags |= 2 + 16; } - if (w->frame_count > trailer) { - avio_write(s->pb, "ANMF", 4); - avio_wl32(s->pb, 16 + w->last_pkt->size - skip); - avio_wl24(s->pb, 0); + if (vp8x) { + avio_write(s->pb, "VP8X", 4); + avio_wl32(s->pb, 10); + avio_w8(s->pb, flags); avio_wl24(s->pb, 0); avio_wl24(s->pb, st->codecpar->width - 1); avio_wl24(s->pb, st->codecpar->height - 1); - if (w->last_pkt->pts != AV_NOPTS_VALUE && pts != AV_NOPTS_VALUE) { - avio_wl24(s->pb, pts - w->last_pkt->pts); - } else - avio_wl24(s->pb, w->last_pkt->duration); - avio_w8(s->pb, 0); } - avio_write(s->pb, w->last_pkt->data + skip, w->last_pkt->size - skip); - av_packet_unref(w->last_pkt); + if (!trailer) { + avio_write(s->pb, "ANIM", 4); + avio_wl32(s->pb, 6); + avio_wl32(s->pb, 0xFFFFFFFF); + avio_wl16(s->pb, w->loop); + } + } + + if (w->frame_count > trailer) { + avio_write(s->pb, "ANMF", 4); + avio_wl32(s->pb, 16 + w->last_pkt->size - skip); + avio_wl24(s->pb, 0); + avio_wl24(s->pb, 0); + avio_wl24(s->pb, st->codecpar->width - 1); + avio_wl24(s->pb, st->codecpar->height - 1); + if (w->last_pkt->pts != AV_NOPTS_VALUE && pts != AV_NOPTS_VALUE) { + avio_wl24(s->pb, pts - w->last_pkt->pts); + } else + avio_wl24(s->pb, w->last_pkt->duration); + avio_w8(s->pb, 0); + } + avio_write(s->pb, w->last_pkt->data + skip, w->last_pkt->size - skip); + av_packet_unref(w->last_pkt); return 0; }