From patchwork Thu Sep 23 15:28:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30497 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp567808iob; Thu, 23 Sep 2021 08:31:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwSnRmNmYrZlEbwaIQq6hr8cbkcn4g+AXyBAaO5e7ss+f9N8oR7UtVCxuiXjR6g1Q+cZlwf X-Received: by 2002:a05:6402:1241:: with SMTP id l1mr6041683edw.123.1632411109062; Thu, 23 Sep 2021 08:31:49 -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 k7si6358256ejk.77.2021.09.23.08.31.48; Thu, 23 Sep 2021 08:31:49 -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="FPZgh/DS"; 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 EEA3168ADFF; Thu, 23 Sep 2021 18:29:43 +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-oln040092065067.outbound.protection.outlook.com [40.92.65.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0ED6A68AD3D for ; Thu, 23 Sep 2021 18:29:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Jkf5mjOTmXiYwpZ+6kb86JGZ9j2v5ZTpKF7sHwcf7nHUOTsXcTKWZEBCInyviW7uFvNHVZluwep/KSsU/VM0RuMQtT0qBhNW9Nz7l2Xi70TPSPDlD9Sl09sB+ukfhAre5TC8hBftHT45+v0PwoGv9jhM95WF++dWADaydF4ap02yEr3S7Ey2ujH2/6GFc+Eth6SDHqg/nbRxN5SdoI48HpWUTQwTmwVeZCndKv5o3LEig1zXW+4QzLkb0Lz3CQajZte7SHCU8PFCkZjl23fLf2EgDKLSBHrjzmo560mQQgUP+CqifqHb4IYrHlGsX5stjENEVlMS1u7+mJRx9c0bhw== 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=b2reFRkQBmznknVouBzVyhhDmV3A7WJSfKDBkKfxFRc=; b=e9lJRmFuvuYRV/e5ULnHV5N19R2zCqFHi7cePtjiHv3+U7hxS77h9mnWispKh+droxsI4+nidLEoVprpkZWMtBFflOvQKdPWepW1FoQqS1G7YEQf2pJCLLIPTHAj16f0egdVBAhI7st6SQgMPMwJK0CqOtCsKhrf0CLeiD39Hvulcrj+Mjab8006aJnq9s6BONAQXrEhUvmADEpIRRWT1EOfA3oebcAAEHMB+5XpCPxKh1a2bEP9yddAEMWlUK9bvlDu0ORzRy0qA/bUeKYSzxvgy9TioaEtglIy0+5xNM93ATM+ZiKeRLP1A/yj59b4MehR76jauLxPQuPONs72Zg== 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=b2reFRkQBmznknVouBzVyhhDmV3A7WJSfKDBkKfxFRc=; b=FPZgh/DSGgtkTUWJVyyUIPfHhA8r7ENDIv1GVPweZwelKLoUfyhV5nxS2Fcn4qtbPwUjQCHbB8YGPF7GvJNLH34dMoKX1XDkJCs9ovEyV+I8dSKMIbji1gxw7hqy4motbV4WJRwikAzrD4B2qJkxqUsZgcmlTO4cLWJjRq9hyapa+Vs+gNm26rZToU988ynAjX2SMGRWqfjOMw188Rtvie67O4dXxChgqiZiidaRMeQgl86np3OYgu57uOQ0bAOz+aIu5sjsskqVlaEHW3YA+9RRDgxtgaQYV4Q5zyW3itNbgBgriPx/N0kOKh4rNIpREB4NMEpshWtI5gbJEvIBKg== 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:39 +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:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 17:28:49 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Mcam92j30rAlM0VvNNvZk7DSYiM5a3xp] 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-13-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:38 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4d604216-a0f5-40cd-348b-08d97ea6f50b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSygBPrM25OmITrtIHMJgdS/wNQIYVWoZnnkfevVsWhaCF3lUsmvVgmxBz7GXfI97BrvcJ0den1+XBIgf3xEpPC8Cc+Rr33LOPpoBMc4mSDzth1BA85/BnDRxPkXVGTgBGu7l6oYR0Jj28qjkDX/5M/LNx/7AgJfA+8EiddzYlND6LNw4orTtNqejHO/DXnRla0ce3NLLDJfBcH6tlbGCmzHuz+CUcDk2q2AsmT+gY8gidapoAxiKeendvY4abPgohaKSBvrxR8q9x2381PDl7wseLaL2/UcBdNsVb7zvY6jUB2jcXs2B2RYE7KDsfuq6wxzGWwNN+EEIGsOxqb4rJIK2ZUxDjhQe66B29gpkmKhHs+zic4mbM2ElY7JEyL7+YmlRrlFLjvTfaBjANz+bdKrd8nT0SleSDzmfta3uyczmms4aK2Pr3SLcYm82N4fJ08YnC0dBr4Qa+QQjCdR6AT2+3OPaHJTwNKEpe6xYM+b9ofVUV4y3b8xAawhRkFmbe7zq66NUW9OHBN3G612Hfo2djzv+DKiLWlu8EVQ2zEmFr9DbyTnoCrSRPrhJPw+3QqltAma1lEKKPw8AWULquYPI4hAsl+xMKWGK+bGHxkh9Wxf4QFmywNI58JqsFqN06ZRXxf5/jqTjio0aZkJHNUo3RB1US78ocAO1qHCI6XU/SJtIXsKcfbFv1IcUeAHNpzVSvvJkmeda8Uj+IJP/Ce8jFPkH234BstbHW9RnqIb/fbg7ZGhMOCBYwVrzB2VHM= X-MS-TrafficTypeDiagnostic: AS8PR03MB7061: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gaC/jI/N04f8dtnQ8CkLZgBsviOYMVu0ELg35BRp/JxemdyR1QEY8DujbRKDpkBmySb/a43083uPj40wH9J4hw7r3j/Rw7KQFkC3N3mO8/U1tRNDquv2u5mykWLPW05xNNEkJJR0cmSsR3d1NtHu29Lj/ZVlmYWh1Sl+ZApNQf7vtXlBh8KzkfDcUuIyL9Xz/SrNlqjbMZD1QH1pfOjy3zWOGeyIFeIztCw4gCVQbme0JOcXxv/tL324bcFDw+p4JSJ29K3KVUEv4H6Nyr8oMrsPD91k318O+X+1iWqtbUwn7SFtN2NZSO0t4YLS3X+zvjxLW5dwRLBJK/fPvjtUZ8tnUF++k5TkPMYFXfaZHWhh8WfQW5Ol4cxtOO88yPmzAOwYbnIRkbkQXtgjaZ5LnTX2IWCRMXyIkFI1Ot7lTFyuTo6tUKRroWn8lmACTFEZ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gwoVtpQHgkjAzF+kDAacpVrrlrIoKgQQj3ueE6KgCmrUqhcdWSfIOl3L8K4qsGDhf1lM6xspiNX8FmVCj7VkmM2LZjcr5y2axSYPbr5Eg72XIEay6iQEBUmDhIXqcN+m6aVMXsH7V2wSWk4F/247qw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4d604216-a0f5-40cd-348b-08d97ea6f50b 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:39.2310 (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 14/27] avformat/movenc: Simplify reserving space for tfrf tags 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: WptzZsJcBE8z Signed-off-by: Andreas Rheinhardt --- libavformat/movenc.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 53c8ffadd5..7650ac5ed3 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1344,7 +1344,6 @@ static int mov_write_hvcc_tag(AVIOContext *pb, MOVTrack *track) /* also used by all avid codecs (dv, imx, meridien) and their variants */ static int mov_write_avid_tag(AVIOContext *pb, MOVTrack *track) { - int i; int interlaced; int cid; int display_width = track->par->width; @@ -1419,8 +1418,7 @@ static int mov_write_avid_tag(AVIOContext *pb, MOVTrack *track) avio_wb32(pb, 6); /* unknown */ } /* padding */ - for (i = 0; i < 10; i++) - avio_wb64(pb, 0); + ffio_fill(pb, 0, 10 * 8); return 0; } @@ -1925,10 +1923,7 @@ static int mov_write_dvcc_dvvc_tag(AVFormatContext *s, AVIOContext *pb, AVDOVIDe dovi->bl_present_flag); avio_wb32(pb, (dovi->dv_bl_signal_compatibility_id << 28) | 0); - avio_wb32(pb, 0); /* reserved */ - avio_wb32(pb, 0); /* reserved */ - avio_wb32(pb, 0); /* reserved */ - avio_wb32(pb, 0); /* reserved */ + ffio_fill(pb, 0, 4 * 4); /* reserved */ av_log(s, AV_LOG_DEBUG, "DOVI in %s box, version: %d.%d, profile: %d, level: %d, " "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n", dovi->dv_profile > 7 ? "dvvC" : "dvcC", @@ -2159,9 +2154,7 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex avio_wb32(pb, 0x200); /* Spatial Quality = normal */ } } else { - avio_wb32(pb, 0); /* Reserved */ - avio_wb32(pb, 0); /* Reserved */ - avio_wb32(pb, 0); /* Reserved */ + ffio_fill(pb, 0, 3 * 4); /* Reserved */ } avio_wb16(pb, track->par->width); /* Video width */ avio_wb16(pb, track->height); /* Video height */ @@ -3506,9 +3499,7 @@ static int mov_write_mvhd_tag(AVIOContext *pb, MOVMuxContext *mov) avio_wb32(pb, 0x00010000); /* reserved (preferred rate) 1.0 = normal */ avio_wb16(pb, 0x0100); /* reserved (preferred volume) 1.0 = normal */ - avio_wb16(pb, 0); /* reserved */ - avio_wb32(pb, 0); /* reserved */ - avio_wb32(pb, 0); /* reserved */ + ffio_fill(pb, 0, 2 + 2 * 4); /* reserved */ /* Matrix structure */ write_matrix(pb, 1, 0, 0, 1, 0, 0); @@ -4668,7 +4659,7 @@ static int mov_write_traf_tag(AVIOContext *pb, MOVMuxContext *mov, mov_write_tfxd_tag(pb, track); if (mov->ism_lookahead) { - int i, size = 16 + 4 + 1 + 16 * mov->ism_lookahead; + int size = 16 + 4 + 1 + 16 * mov->ism_lookahead; if (track->nb_frag_info > 0) { MOVFragmentInfo *info = &track->frag_info[track->nb_frag_info - 1]; @@ -4677,8 +4668,7 @@ static int mov_write_traf_tag(AVIOContext *pb, MOVMuxContext *mov, } avio_wb32(pb, 8 + size); ffio_wfourcc(pb, "free"); - for (i = 0; i < size; i++) - avio_w8(pb, 0); + ffio_fill(pb, 0, size); } }