From patchwork Thu Sep 23 15:28:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30491 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp569086iob; Thu, 23 Sep 2021 08:33:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy6Twqyp6cLlO7dRLH+Bvn4f88ZvCIFes0NP8rJlzmHeTSuqUNMKAfbn7O9s2sDU2oxZjvd X-Received: by 2002:a17:907:785a:: with SMTP id lb26mr5722279ejc.77.1632411193237; Thu, 23 Sep 2021 08:33:13 -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 a18si5751336ejj.147.2021.09.23.08.33.12; Thu, 23 Sep 2021 08:33:13 -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=f6wKFPGZ; 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 F198B68AED0; Thu, 23 Sep 2021 18:30:13 +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-oln040092074105.outbound.protection.outlook.com [40.92.74.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 63E9068AE7C for ; Thu, 23 Sep 2021 18:30:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DQumpqZhrulsocX5r6RxF5/G/F65NLMwbPf6QnDGcOSmSKuq0ZTHhW4TWqpPbbclSRrMrZpZKkxS1vUiKGN1nzlxfmJ7S0Qe8VRgVDuDozShAA6rVKBliUOHvQiMHkMrueZgWr+yKt3cZsv2DagCzbZSBFRYS3nYa/yGP52HNDsgvyHVFVM1wwf3WB6P2vyT4vdrItOdnfj1dS+kz8+OgSRSuJcBylP32UOU0s8i0wJfD3RvpKvwtmHFVYhYFJyaVYpqFqIuPTbiTu3xHlGlYxP3vAIO3qjqxoHYJD2xhmWyBBHGj2WQ/okcqW4wP26/S84pGqxMEu6vs4C/vcIHgg== 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=2PDDXLuMJgQs2N/Hoso2G53xtTx2Hrk7mGUConY/Y2g=; b=mdY4rnb5xYbZAgucOkmkKIaKy3Wm84WSb/uA4ZnvbejxOutB9CuM5hKU5Pz74ei7N8xJRkvE+xPEcDgrEOoYN4iOLI3weAUFI1LL5r9V+s4pB08jToWn8gaZ3KXj+y05gDb/s8++JnJgiIcn66shms+pAGBoOL4UG+pFtm2NyEBGmqorCwHIHO95Gu1yZ6PuQaHlVvmQgEYWO51bMOg/vqkYjD+Udo/4px9Js0CTYKD4NTZPJsuSHQu1+uiysLLP0fbFkgWQd2L3HnvC9YWu9KtUwEm5+NynErfG+EI+DEUf+h0ZSkvs0UpxraTXKQ3qHuEpRLbNk9eXEWgJUra9kQ== 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=2PDDXLuMJgQs2N/Hoso2G53xtTx2Hrk7mGUConY/Y2g=; b=f6wKFPGZ3VQHOcImbZBoJpybtvgQwnH/4D6wdoj5Af04IigNSKYN04cyz0PSX2o8gnVjZwcnAYNI3HPEXWiy/4jZ/+Vtu/qQjo78TY4RV1NjdZ65iQVjIe3B4PL1ImZW5dtEK3Jvj3p97QnxLDIuUZ3dvH1KqEkcbrWRNyXrhICxfpJdq3OPFvuxLitglaOs3UU0AyxcbnK1xQKm+JNqgxBhLO9pHW8OHKkVbHO1eJLH0ajmD6WaYXgRLijsZ5P3AmPVQLB6r5XgBasHnCzME/TP1lvTSOK9LP7QDkEMKBiBcvAZibcbD07HFBvMgbucSFMMhKmHvq09NLZYGHjmkA== 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:10 +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:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 17:28:58 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [A4ekD/0uc6v6yake3otlN9s7byS4j/rG] 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-22-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:10 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 19ad4a2f-befe-4d21-d8e6-08d97ea707d0 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWt8qMG3IjM1pM+gnFiFAdPVfCiTmwYgzvRYrsnHLsolcIx6zf4olqSh6o1w6LPAklfK2UD4SxVtE/X47S4UmFYt64MhLJVn0y/Wl/uLv7hajn7HQks1yAY+XUv5HxeXY0klm4NjnXOoljShGV91dCVQo5cDqBoDFfEEvZfFKjNTiDUxURfnsriex+sg25rqGkhWin3VFEsEhaHe1j5TfTy3F8YrGxNJt2Puyw5tKsXiugDBYShHJYkEsciAxxEZTx3SVe3Rw5vZpWmSRLSPRBU39s+MJPKdiOL7XP53nQitIPZ0eYsK+ZJ6A3YaifcsaTC/fLdTsLY7QDP0deuTHLY3dXhNX7u5TLDHjiRXA9lmoX9p08/LmE6wmTzmPwVQNchPviN2F/p/sd9f0IyOcL6UNW+X1is5v5UyjOPl+4D0SsWA1c4Rfov17NszFO+A8fLSJPawKYLCkXbiJ5/NfAFwqizdbsUZzdI0i19ppCCH0rg6Az6qh0+PPsSW2Cwi37IrF358QtDVSMuq2P51oqZCxv2I4OpkCa+uuH8WRNeIG02fC/9/EWOM6YKxjE1x+u4YnyB+ce1MHslosXhQ24TwTcD+oV+k1nr+GT13PjuqVmMMhKZQyro66uh3GgWWY8dsiPjeC4j0NkmTlix3JrknyfWWFkWb+sdtoNfbn40OnjDy2R9qZ2se8b04bKsy8AKWIYXPKXOjV2uQeH9K8l34RB+psFh5iI= X-MS-TrafficTypeDiagnostic: AM6PR03MB5172: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: V6FdyBrudVep1VdtVM8f+MMM/hZnyAMR++3gaklQun9hCds5K6V/u2O3Wxq5z3ps22z6xsiLVPYfvQvurUfe5oQhGrN0cEmEJeaCjjnV59FDRiMHAoL5bUQFFsRqi24KO4zqAPUDURdatRKWJQA3ZX+83hgbe3i0qyIdC8wdZYPUjp8ooiNXCKOl5rEeaNWq8ckrHyID7h6zTeHFRjPybLlyvgff6cO1jjCLQtusUEHE3ImXOYOUyUChRLex5WPOgP6KCuy0nfCf62FsewNGEWE8L2PxdDgQMH5tKodsIGKVS04t3I+1ZrnmvlB+gZ9gI4EnDRHuehZgOUCUf1dM/6xuOHoyLZZsR0LIeF82JWzPbGW/xhsb+3ufOOEIc8OoRxT7lOoZShOOVeMyuD4OCe057CrexzrOBhTaD4ze9hPfTHo9gA+KmSgeU5+sPC19 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GCpUoa++bq7B5ESkpd6NyUX6h1uK3CXw6GGJrTrqmuQ3dZknUhpueKl+nn7B1SxX7cCbOYN28b1GlFaDAlngf0P9n371KDXEoYxh9LNpn5jPJaoG5wKRfD1PcHEg02ho/IA7M3qgwAAKiiakk+c8uQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 19ad4a2f-befe-4d21-d8e6-08d97ea707d0 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:10.7452 (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 23/27] avformat/omaenc: 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: qWZma6HKQ9vb Signed-off-by: Andreas Rheinhardt --- libavformat/omaenc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavformat/omaenc.c b/libavformat/omaenc.c index ec71956fbd..1c4edcac5c 100644 --- a/libavformat/omaenc.c +++ b/libavformat/omaenc.c @@ -29,7 +29,6 @@ static av_cold int oma_write_header(AVFormatContext *s) { - int i; AVCodecParameters *par; int srate_index; int isjointstereo; @@ -55,8 +54,7 @@ static av_cold int oma_write_header(AVFormatContext *s) avio_w8(s->pb, EA3_HEADER_SIZE >> 7); avio_w8(s->pb, EA3_HEADER_SIZE & 0x7F); avio_wl16(s->pb, 0xFFFF); /* not encrypted */ - for (i = 0; i < 6; i++) - avio_wl32(s->pb, 0); /* Padding + DRM id */ + ffio_fill(s->pb, 0, 6 * 4); /* Padding + DRM id */ switch (par->codec_tag) { case OMA_CODECID_ATRAC3: @@ -88,8 +86,7 @@ static av_cold int oma_write_header(AVFormatContext *s) av_fourcc2str(par->codec_tag)); return AVERROR(EINVAL); } - for (i = 0; i < (EA3_HEADER_SIZE - 36)/4; i++) - avio_wl32(s->pb, 0); /* Padding */ + ffio_fill(s->pb, 0, EA3_HEADER_SIZE - 36); /* Padding */ return 0; }