From patchwork Tue Aug 8 16:40:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43183 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp2408643pzh; Tue, 8 Aug 2023 09:40:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFKlbV6OiR74Tkn5hKvf5iePuCsHCtpu0MaJnjURKKb2YXVGn6frjmBDtV2YnKTFTCo9a9P X-Received: by 2002:aa7:c695:0:b0:523:2b9e:6357 with SMTP id n21-20020aa7c695000000b005232b9e6357mr286304edq.35.1691512839708; Tue, 08 Aug 2023 09:40:39 -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 g16-20020a50ee10000000b005233795f440si3411007eds.359.2023.08.08.09.40.39; Tue, 08 Aug 2023 09:40:39 -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=q5YcesXo; 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 5671068C802; Tue, 8 Aug 2023 19:39:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2103.outbound.protection.outlook.com [40.92.91.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E79F68C780 for ; Tue, 8 Aug 2023 19:39:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wp+UjRZmjqQLNhGpzy5CcDB2J+RPahOtfCpepWBOETL2bL/7OwCwKFluDvHw9O1GYvp5LvINqo7evAiSSzYot2GeM204x5upmq2uApDi5pw5HoNAOzovqaf74B6uYxJWHXau7zVLtzwUD3yASSQl6xZooBz+vYMoN4SYqC8b/cWICYceTrNM1/Bc6K4altg6pNKPPjpszPWBHbPvyQGcTwEsQ0JGkTFhi8ot/ookn98P4Ytc5tDAsEYYT/faNTrIRd4HquixPbHuxY3FQ7OnXCIcvcpQ3gf1PLVpnRY21aajARZ4uyEysp9rPqVGvqDaRLwbwYgC6cAG51Czcspmag== 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=XMPCQLgAP1EJEK3C4ErUe9/MsX2+WUWiEmBGP3Q7Yso=; b=Nv+xwm6FDCh/u3pJHp9Oui7duiZK0nRmndjVkoEXRmGVAS2GsbNBRZf0W5OQx5VFD1A/8fb1NdlsTNcb7VIRcuuQ2z2POulmIht/OEpEnswyqRHqioW1821fAlidoro62UWUeLZYIhxmn6mCch0YEVl6R8VTeOV2HNGuXjZmlOgG5ioBBx2k0EncmLgnv6KaxREr+v8iJHVYvyGRfColQHsipdiUYqqmYDYmuGfriLRRg6cdr8AnLFTi4hhfVuw6RnF7D2mJrh4EG6gKtoWG/8nq/0ABrkidTOGZXuR9w8sRUaR1uf2vPzxn6kL33V/N4Mx/SOZk+B1a6rbJU7geiw== 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=XMPCQLgAP1EJEK3C4ErUe9/MsX2+WUWiEmBGP3Q7Yso=; b=q5YcesXoKacZAyFqP/tMC6sth4L5MnDsatc+w3SrrD/A7iVb+cznuoCQEGSgv47dyF0fcTxC+xIUn0fWGm6PO7iv1qBuQ4ziaFrwpkp4FTjh/cOQKzntagzSRRLEkUpLN/tGIfrbMg4UvDPEJpkGvx+icu1fS5cQ6oOpS5pA7LpmqHKtXC57nd3haCejePsS6d1xqdtu0u4bVshisvzRxJnSG7eoavYEn1yhzRA5IqkklxUpzP9mlE3zw3M4tR5UkOKQ6+YNEYS2W+0QHfkhW7NnpdQskeG8WM6w9jsA7HqogUMEL6k1hi8u+3VRPHyHt52f9bjSjfG9Glz0dgD1/A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0268.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Tue, 8 Aug 2023 16:39:46 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Tue, 8 Aug 2023 16:39:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Aug 2023 18:40:30 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [19/Um4CC4aTnbL2pnv91eZlAqGMUNGHsMkQppGiYLyw=] X-ClientProxiedBy: ZR0P278CA0085.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230808164036.810177-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0268:EE_ X-MS-Office365-Filtering-Correlation-Id: b5b18c1d-2f3a-4b32-436c-08db982e1305 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoMTHls4qxpPCYYkh36TB/2pp2BwPczA1nSrk4ZV9zZ0MfOZvEwU8EZ3Ufi6KLRoIepwA/hJFdBfrNVtLedROtPfegQ2wXeLbOykzbX22frQtYlf4XLJ5AUBG32Yrb5lJhl3MeWqGz+47Acr+B8ll8prZfNu8OePhsNi3vZm/8GCVRtoRfNsv+HW8pcHKI5/bZrX6hEmHieDusXXS+FQgFRbPjPSVeSttXJI5rXpMhb9iLrp2AxENO9L9UKF8dqpSelasA2OxGl1RrfZm1N8rOgNhcrIb0jn9+Yr1jBZ+fmxla4o7S4SXMiPNGq5daF3J6NJu54hJ5bg036sYPSC/+ayZi4ydydYKipoUafxS0szt6a5xNqcSs938udkvvPMg8nx393HXQpMBb4E+NnNoimYhYrnwH+S7Aj9Jp9bgxPTgRpjCfOsp+Lbas3jsO7W/gVztChn/HJdKJX0dQ1+a68BLDPok5NuzNIypachXhkfRKz+a7EmMKOPNaLo+MEp11rM1axJLl0RCMBfrdMIwzBs+xp97XsrMcUBdcDeJZDr7fwlOR5VLUllI49tna5yFA597zgY41H9imKlHcvL2+uiwoKIk5wvmQQcUdYC/3/F/Tl0ngxUdAdP0dawjBtm/V+V9OlZthsaOIDSPokWApD4ODqdVQ4qNfZXfNAk5pcyOSveL+pCuZGg7XMNpbY9NDOogPFJ2I2gxxrhD+Nj6L7mNyreeC1OZXnq4I0PSzMxUwzBh0CA5lYULBpItl/UCg= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jjnrHCwP7p7dU7oLunHr62eTcb5J1+3vpGxgB//yPZwXV8C8IOJBuvy5s+J6tPhLKNeEyMFDsLaV2xORl7EZDIkFqJLECGXqZRCvPBkFaQTeFJGm47T8Ar17/HzOyZSGfW1MuKvIhziNOhd6Q/EX5k1gQqN+MxB41bJRj9XkS2ZbQJBcuUfGA8820AfQxn5n3oiG58Xj82WTeqdLNmyjZJmeeAKs8GCm9Q+ifLWcl7Vq8H9yvX4HR7uOtmLFZ/fM8EYV3A24CMCg4GQtjYx+29m/MRYXK0L8ewL+Oe9UpKedWISa+jm6GWOjT3fu/00BVcUuGz6JCuTS/7a9xCY6wk+4pLPDypBv0gwaB2qbTs07KqGpdkcK5y2PwDHZb0vj9kSe36PpViAXWIvhsqu0rl2pONvBiBc+lsexRUcuR6cswsw5mTOC4rhmv5UZTRNAPm+w8AwuLy6gKUApHT+XrhWz8olKzMIB3X3KIWYFOlR58b1s/z4mlrbVujn2ib2bmDKDUFaVGEnNiQetz3OwW6VdFhjShrJtspBYX8PdQXqv5m1B2DwmuRl6reLbSTI3XgfX0BfwZ+vjMVOFne8txWGnf2/GWCdYDvX8XrI3phk= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GI+P4e/CgatOFo1Bh/jAF0+H2OcfDA517M/YlwoTIxax1SbAPfNxvHU4KoSRG4I0/CPPoShom7/6aYqpNZcwB/n2gJJbdHQqVw7OBtfKNjg20Y6tvaQVYS7RDSphnTpMyRPRZimdfrYxHfUuw2FflT7eJ0Df/q5OaXCEHLppMJXqFUX6kbzjvCWf/CpnHA22NEoBq2U798/w8JwGc0RYNY3Z+zQA+VngV+C5yJk8AXVmx61/Kjk/yP+GfxvMIdk55L2VwuslGdrDO/0QbNbqPUkxQA+9M/4ErG8MF3ok9RcF6meaUlQmWf8OQT3YO83CA7n5axqz7k2wxUqYj+PiuyvChuc/etZxggxTGeJNtJlkOFmQz1YKV4UajvVxHJjMi9aCbqATPu+A6cYYeZABUL0d8u7fpL3X8IS9KxRnBlgHbRqPPRciqIfEJjoLERGdyLJSnHbeGzKtXClxCZ+z2CD4DUEpgzxDYlqPklDZ+b13IwIem+EbT0DdIrRn9KqgOPXIbSwmDe/zEMnoaNDYkewP7Fmv2Q9XrOxuPh7HW/ZYw6Eq/ch2RzdOL84KpSvXqhBXxS4aSA3mOPD7CeISeTI3hGkKDL6PSw8AomKatmkcaUiqP3RPj5o6LKeRGqP27QcvuTBBf1Mf+UpI+yES8SrtAvQ6mGuA4N62vMdDO2Pkr5GjAwP3HkK6to/sTILAGKpsyXm2C9MgTS3v1sp0MTTpftEKpJ1oDJAFWda2RaWEnEOz3Nz5nNBb6+uaM14yWGWO79221MghHM3AkZsel38sPalPwvKnyV/8QznxTzaXBdqKXhvk7n0pH5P66jRsjNlca719qOJOHBE3IcVBMDaV7aHsVHgd/zDYGG4dW6c6TVHw4jwq4IzIWDwGb+si/owHGzfVzVAXvjdiD7hC3HcnIhGIbtwKdVufw7b31JizURR4TDX6c7GD5rltCkq4S/JNhFab5OoQ2sTnyh8rb4zlNr7UJMfRgfNicCtq15VKlfAFRdz48Kfc+VkzWCSdJgh24eSyG9FfSJPAHbUpL8QD8sMVIQ6A3rnPacnNwFt5sEVWq7A3gXBwtsAhYVxyj11sqrsGmm6hGIVZcS8+sMhnxDebxDL82r5twjrdzw/KMOlvH84WSQND/OJEDm1WzlcoY722PHpgBUeuLGDqXotVgNktDTtS7DYIfSoImHlocE5+imNyEHyL6mf4recg3uHwUJ1coq9OusjaDO+gzgC2xEqGPWE34rdZidnnT4z3+T+V3FIHCjyeUJcJX4Co X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b5b18c1d-2f3a-4b32-436c-08db982e1305 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 16:39:46.0547 (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: AS8P250MB0268 Subject: [FFmpeg-devel] [PATCH 09/15] avformat/matroskaenc: Use dedicated pointer for accesses 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: l6YSeA3iYs/h Improves readability; also split overlong lines. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index bfe6342d9b..323379c8bc 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -3200,7 +3200,9 @@ after_cues: if (mkv->track.bc) { // write Tracks master - if (!IS_WEBM(mkv)) + if (!IS_WEBM(mkv)) { + AVIOContext *track_bc = mkv->track.bc; + for (unsigned i = 0; i < s->nb_streams; i++) { const mkv_track *track = &mkv->tracks[i]; @@ -3210,16 +3212,20 @@ after_cues: // We reserved a single byte to write this value. av_assert0(track->max_blockaddid <= 0xFF); - avio_seek(mkv->track.bc, track->blockadditionmapping_offset, SEEK_SET); + avio_seek(track_bc, track->blockadditionmapping_offset, SEEK_SET); - put_ebml_uint(mkv->track.bc, MATROSKA_ID_TRACKMAXBLKADDID, track->max_blockaddid); + put_ebml_uint(track_bc, MATROSKA_ID_TRACKMAXBLKADDID, + track->max_blockaddid); if (track->max_blockaddid == MATROSKA_BLOCK_ADD_ID_ITU_T_T35) { - ebml_master mapping_master = start_ebml_master(mkv->track.bc, MATROSKA_ID_TRACKBLKADDMAPPING, 8); - put_ebml_uint(mkv->track.bc, MATROSKA_ID_BLKADDIDTYPE, MATROSKA_BLOCK_ADD_ID_TYPE_ITU_T_T35); - put_ebml_uint(mkv->track.bc, MATROSKA_ID_BLKADDIDVALUE, MATROSKA_BLOCK_ADD_ID_ITU_T_T35); - end_ebml_master(mkv->track.bc, mapping_master); + ebml_master mapping_master = start_ebml_master(track_bc, MATROSKA_ID_TRACKBLKADDMAPPING, 8); + put_ebml_uint(track_bc, MATROSKA_ID_BLKADDIDTYPE, + MATROSKA_BLOCK_ADD_ID_TYPE_ITU_T_T35); + put_ebml_uint(track_bc, MATROSKA_ID_BLKADDIDVALUE, + MATROSKA_BLOCK_ADD_ID_ITU_T_T35); + end_ebml_master(track_bc, mapping_master); } } + } avio_seek(pb, mkv->track.pos, SEEK_SET); ret = end_ebml_master_crc32(pb, &mkv->track.bc, mkv,