From patchwork Thu Sep 23 15:29:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30499 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp569499iob; Thu, 23 Sep 2021 08:33:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxkEImr3WDDSQybrlxk893LhrwHsMAIAyVadLp1Kx4Gjir2T7nII68pWh6aiCgs0cm5jsCI X-Received: by 2002:a05:6402:2049:: with SMTP id bc9mr6239257edb.317.1632411218504; Thu, 23 Sep 2021 08:33:38 -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 g22si6283003edb.47.2021.09.23.08.33.37; Thu, 23 Sep 2021 08:33:38 -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=YwCSJyjn; 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 40E9568AF0E; Thu, 23 Sep 2021 18:30:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074076.outbound.protection.outlook.com [40.92.74.76]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E0D0468A949 for ; Thu, 23 Sep 2021 18:30:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iHfhoRYdVAPUJsXCSr6EdfG8CQK5JwU+FJeYNMPZqq/NbxJ8NtNOkinlHADHx6Gc//k5q+OKp/gT3p8xquYNg8SlSa82hE22uQMJL6Ok5ULCy5jTRIiXyYoceqgBryFrnLEPlgOk4Eioi4nhXE+7qVw6Wf6qmSzORKv+IlOzxh0TjlT4//ADOM8NqzHV/v9PJ/D8TXz5tRyvp7hrxySQjAWEm38LQ65blU7tT5+PZml13x7D7eL65KVvZPdz3Iyi8fVT9Wm03Z/9GTepDVR1Y0PVlpSVhQSBLTeUf62KAD1rpNyvVFg+4sskbQ/F4ubuFvoF/T85MYbdZSH17d5t+g== 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=cNLaXPoIVBYWeS3FfRzdFyoSxIhNyvsqR9MCAHdnTuE=; b=MJN8FNdxGxtiOz6+xIqDDgn6SEEomFSb3zjlh0mkHfr9DMgGXaNxidqcAsxqYI09xNR8LbyJwMUJOA+TrR5T6ejaJJ2jNELYnXoG5uRtPSIccJi5lPSrnebw+sYDMtugA1MPjwWizEHR3VV/MOz3HHNIeFdG1JzUlyiqkx1maVjqkzTcFwNBhZge4K4pAxL/OH7oJeshRRIkc9wLWKuCYQANOxS6rDsakZIW8mW9wa88McUyV9sBo++1YbstRYErFmsXoOA6jbGU2KYFf6NpzCmla9JAobEbdkKDl59gAy/rq27qZVFgDInu/yotA+PCmGZt4/2Lm7ecOoDMRHQQwg== 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=cNLaXPoIVBYWeS3FfRzdFyoSxIhNyvsqR9MCAHdnTuE=; b=YwCSJyjnNREB8R2c7mdo4NM/l4fFUQ41KYyPZLnVMhx+O/Ho8iuFCUz37AlCLz7Xu8RerOk3904u6+6Mdgd4adRAT9iU8ZXZgJZ8UZ/vWEmAzWO9ZF/NXnwnLqwq5ppzMOr+GYhFQADMZqOj6gvI7BATRX3E1FMxn2ocJL+Jod/EU0TZ7EQOTYPBs9LnDZDKG12oBjPz5HfP6WABtcToeUAA9+dN3km+OfW4URueLtvaYfbgCxsk2XKlLTGdEpCh9W8XBHz33BTGOI3uU0C5IHHsaGtU29Irq+QlP36MddauZQvwWuD17iL5CGTdl8mrV9C1KitYg/0b0LFU0glvUA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5172.eurprd03.prod.outlook.com (2603:10a6:20b:c1::13) 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:30:16 +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:30:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 17:29:00 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Xb4Tkn/Jpe8syP/gFCSHI84cd0984qHe] 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-24-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:30:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 706d42f7-caa0-416c-5e5a-08d97ea70b37 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWt8qMG3IjM1pM+gnFiFAdPVfCiTmwYgzvRYrsnHLsolZCUjPpCJC5zROxG0QZZRgw6X3VYFP79ZCgSOkvlYPfFrJsiPCBpPIIomcxBtCob9m+u5Ee2RqVYnsPG7opC+AKRk9pXspCdCaovsetFxbFTELVH2Vv5ySPwFKq5fLbsYpWCvOb6FPZQpkHhbx5CZPHmj8XGx6IlEVrAT5IiOKORVIyhhx9eGDqbDpS8Tvv1MBJUk6XEjnv8mB3AOQDeROQghW8ASIhwW8jk8cUGEud6nFlQZOnc+WKHD17LFPjRmdNv7BqLvomLPuocYyBeD3N040IeSP1HEGWzZaBhbiIkefwR8IvIoozq2f3nlzIwn9dM289ONdlwwBA8aa7DsshdTWvnbhkH8n9wlEYeJsYknzORZjNwnNCMUH29wMUkqafCsP2zoIj7WoVV/R5GX3DHCbX3QjytrTPsBUWZAGrdq5SUaiM42q5hF4MPPwfg3x/B7s5tbjIOTYNer58LHCUHX/VqxfC+dXIFJ+yteTr4CLhZkDPDB9ux+jKc4C2G1ZgeMpcHHS/qCSoOm0/1cu+RtU14J/OQIIrgD82YxKeUtN+Q9tjljD9Qs2v7n84TxzHcPEu3bj5HnTj5NBcYk8+I6Ajlu5+CS7ccnzbmwZ6ZNnhjpjYPp0WCgF3Zk7bHgu5I/l7EFAHKzKPLUJsX/XKnpguV2XUueDOY3CnAHV+rC4rDkkl6j30= X-MS-TrafficTypeDiagnostic: AM6PR03MB5172: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MMaVnkRDulLJz3YW6mEte0BCB2+8QEvsGdq+f+5BkrKMe+oy9nBHrjLDHU7VqL+LRNG7glvljPa3zIIbZ6fmHyYWnHVgZCs6TINVmQYJsAb5RtDUd1f/4JO4Nm8aRDADbRxIYuva3gW9DWv/by5nmq6HpinkNnnzf+QfLTLuiAqiJuZLVMpIcAqCmyyXYvSDLAk0HSmM7CaMoQpCm8y0PDdAcJe/Xd6Dro63keNZUwMIMzYaxa8S5AndNNvVKqAS/ZQLri6jTTrkKxiLrHKYg2f0bJp7dtUa8X0Q0lMwvf3rjZKi0KYrE85ttKmSBh2znihrpuGiaHKvSYNLBCHp1osxXB2HbvlLONOBDmvYINcugf5ZkWCK9s2118Ah/p3biY1lBYAe8qJZ3W+VDOnOnxwSVWKBnQCBszbfQACP6gp8BkAMmrKPVBU9ggVjBrdU X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: s/ZXVtX2CWKEnKo75pclnF+fy+3utUvvRXeeWdGFHvH7PYQmcd7Zn7a0K4XFKquHlV7HVtQVzYBf/6qD1CHWDIzsV+2B6y86u+OFbcUIK+MGalb0Lf9wwKqpQ4aNguHIdDrc/wDh3x0ynJh0BoMHLA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 706d42f7-caa0-416c-5e5a-08d97ea70b37 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:30:16.4582 (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: AM6PR03MB5172 Subject: [FFmpeg-devel] [PATCH 25/27] avformat/avienc: Simplify writing padding 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: Ard7vJdRq1cH Signed-off-by: Andreas Rheinhardt --- write_odml_master() was responsible for 134406 of the 135347 calls to avio_wl64() during a fate-run. libavformat/avienc.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 9eb072ce12..3b11841cd3 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -237,7 +237,6 @@ static void write_odml_master(AVFormatContext *s, int stream_index) AVCodecParameters *par = st->codecpar; AVIStream *avist = st->priv_data; unsigned char tag[5]; - int j; /* Starting to lay out AVI OpenDML master index. * We want to make it JUNK entry for now, since we'd @@ -250,10 +249,8 @@ static void write_odml_master(AVFormatContext *s, int stream_index) avio_wl32(pb, 0); /* nEntriesInUse (will fill out later on) */ ffio_wfourcc(pb, avi_stream2fourcc(tag, stream_index, par->codec_type)); /* dwChunkId */ - avio_wl64(pb, 0); /* dwReserved[3] */ - avio_wl32(pb, 0); /* Must be 0. */ - for (j = 0; j < avi->master_index_max_size * 2; j++) - avio_wl64(pb, 0); + ffio_fill(pb, 0, 3 * 4 /* dwReserved[3] */ + + 16LL * avi->master_index_max_size); ff_end_tag(pb, avist->indexes.indx_start); } @@ -351,10 +348,7 @@ static int avi_write_header(AVFormatContext *s) avio_wl32(pb, 0); avio_wl32(pb, 0); } - avio_wl32(pb, 0); /* reserved */ - avio_wl32(pb, 0); /* reserved */ - avio_wl32(pb, 0); /* reserved */ - avio_wl32(pb, 0); /* reserved */ + ffio_fill(pb, 0, 4 * 4); /* reserved */ /* stream list */ for (i = 0; i < n; i++) { @@ -569,8 +563,7 @@ static int avi_write_header(AVFormatContext *s) ffio_wfourcc(pb, "odml"); ffio_wfourcc(pb, "dmlh"); avio_wl32(pb, 248); - for (i = 0; i < 248; i += 4) - avio_wl32(pb, 0); + ffio_fill(pb, 0, 248); ff_end_tag(pb, avi->odml_list); } @@ -586,8 +579,7 @@ static int avi_write_header(AVFormatContext *s) /* some padding for easier tag editing */ if (padding) { list2 = ff_start_tag(pb, "JUNK"); - for (i = padding; i > 0; i -= 4) - avio_wl32(pb, 0); + ffio_fill(pb, 0, FFALIGN((uint32_t)padding, 4)); ff_end_tag(pb, list2); }