From patchwork Sun Jan 16 23:04:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33635 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2274397iog; Sun, 16 Jan 2022 15:08:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJzwra5TXy391eqZJpXaiGFjdpUeSR7+x4NNCpqvICB+TQpLME2aM4UTOnrWAd0NU0QYXEyN X-Received: by 2002:aa7:d689:: with SMTP id d9mr10784849edr.257.1642374482723; Sun, 16 Jan 2022 15:08:02 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ga3si5931996ejb.11.2022.01.16.15.08.02; Sun, 16 Jan 2022 15:08:02 -0800 (PST) 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=nORaUYJ3; 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 9F34A68AFD8; Mon, 17 Jan 2022 01:05:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074023.outbound.protection.outlook.com [40.92.74.23]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 06F7368AFD2 for ; Mon, 17 Jan 2022 01:05:37 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kZMWXTk1jkY2mOV2n+t1e9Cxl6Bvjmkbt7jZwfN+03dpE48VK8HbPL4LqEzt6b1n5gKWaSt8824oTyVFGwf6EJYTTGlnVaHxIGdhxC9thTIaW70OaZDCinQcOWT77UpuvgEb3f9eFlYVWSPOY81jdU2JYkvShA7J/CdJpqCds3Dwrn/cuHOh7nHNtM4CluXT6jxjHEaSgmZZXwzKJ268xKEMZMWL53v4iA35eMzVM/X1+hfLWKJhJKSgezhcGtNHiY6ZqMluezC/erZIDL27imT67jKc7Zm9LxKqT4SGMEqvja+HUY1KhESRQ9Pqhd4UeUhC4984CmjDaOF8PqP9ng== 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=+SAhxOhNRkpOseZlCPM/5jPuogSxrzH+13SW1Rm38a8=; b=L/0IcfTxRXFAO26MTSXmnU7gPIVoWjuiuwZsBfTZubpRmSBOiyWB4Q2lyLt6/N1NH37izB+kkzXXt+WsT60f1UgLmHWe/YSrIOwq81LH9jmlYPQyvG1S+CRueDDaezXHDILAEhAny1lJDtVLEShI0DHl5zz2HtpqrL7D2EbkEebdxg/AKmAHD5OSn6u1s08dhymgiNpL++QE904IXk4lOBH5VWq7+HYxFFXfBgVa4QgQT3bIGFNLdPI7gXzVeSBJdkvc3dgjPIbmM9/J+EPp21Vqs7bZ1sf8DRTyxM+Nb84/uIgWPFsdgTZyAOYQDhmRi1p3XzQx5JllzmtUp3V2vQ== 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=+SAhxOhNRkpOseZlCPM/5jPuogSxrzH+13SW1Rm38a8=; b=nORaUYJ3FRS2vID5rZyJ24VvEnkjS4obSjw9jxpnLfbrCw1NLMqU54gYJjK556+c0c/tiOtujQQ22xmvohM2qpED2ZZt9Vx1n39aL4EbeuOWqQV2OTyDaZuGcs18Dpku8rDZ7na5FTY4/Udz+wSoY2wGTMVrnCJduxga5a7SiRLj0L0eTNg8NJzk1uDGDOs8YcPudWayAHD7q+4siTH3XY4InvTmfH/OvQ8Bfj72MMNai5howLucH4erkn/Wnb8a0WvmyS5KfnR7LWHRt1ELjGKNi9J+0YgMtwjZMIDjR7EomM61z+UmsUFSQ/tJwRq4YjBnwT3CT0hTPF2++3NO4A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR0301MB2560.eurprd03.prod.outlook.com (2603:10a6:800:68::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.11; Sun, 16 Jan 2022 23:05:35 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4888.013; Sun, 16 Jan 2022 23:05:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Jan 2022 00:04:04 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [/wYAK8XGRpJvP78gnEl+AFtvjyDjTz17] X-ClientProxiedBy: AM0PR10CA0070.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:15::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220116230405.194506-23-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f9f12857-3c53-4e5c-c673-08d9d944b469 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQ2WpFcKeHQajRkhOqduPnsxfTkbzGwzUOv+ZH33vJ6221zjztWZkgTbapIZ1vRBV2agD9fsVtg5TUfACuxnOH/VIzDFm/oFlzwB2/4FbcPZtuZ/CV3vPp1E/T16IbW+jJGvxfCaNzMMJhX4YnJnkd3t3bH1j8Wvw8I6Gik1Bw4uSMt1zB/2kBKV7PXhHoY89hvGfF0xigU1vU5LdVXbWEZWZCLYGhPDxvTLsETgYuUAqFXhggr6atypV4nZhUF4ecp5p1WvZto0pgbyDr/YzjQSEtRj5Oc1HzKj/p6LYdRBAXispAmE6zPuWhFEfQf7ZctIfr+t2M/+XaO8A6ggEogp5xY+BUHNAZa03U/NP2eNKEVvYor+cHPj+ZCsSHWN+++r6jSo/AJyaYgXSY5qGwDEtn2nhlFPTWXQlSY2c037ZJZdFjtM8S+3kSlgZU7k35W5I82kZSUX00veKQs8/ulrSQyCKhDXhqj/d+FDcEmmF2CNgcjblpFzAPJMNgOXkccMq9fCr/uMST+BkVABP5B+a6bGeepswe8izEN+Giws5F7/toFVn1V9ND9NWLtqkGpi4MlD3vf0rWpkNoZawrnL5m7drKqMxXlgRTUPVPYFk26iHUEKsEiihh9QZlv7//mB16vh8k/Eqf1HqC6kLV1C64EYXht4hLaXhoW6GkHIpH9hKTetunkZdkwxNg31Yk3aKPNl4Ik12W7oZ0KulB1gdvg8gVltaVkZcYXUbC6XDv2hb+N3fkV/Rw0kc/AIro= X-MS-TrafficTypeDiagnostic: VI1PR0301MB2560:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 74xPsT1d5fPwzA9gvYjBAXuPTKJx2amGEmRV3+5+oLa+bmWUyQhc8Ey3mjbdl3rH71W2n7NFe4Q8bEHR5rJP9TJwvrssDMeXB0r6Ip42S9LtVQPeutDEwJywaHpY88x8rdkU5FFyXXn99q0a/0FX+Qh45s1IJirTTBBoIixsi06rc4v3IifZVgi9m9keIAxsGy4YZYKy9L80juWRNyHS56Vi33RK469wdnZTqMcKy6YxijKzfixZlcdCXi0KUAvvUoh6tSgjFeiUTerXACniHxhmMqcZxVsFBpOfgZb07ecVrn3SjjKMIP+kCBJtAMhWb9MnHbwr7Mzw2tFf6VTLI2aBjlHkZAqET5CONOP+lxuoOsKNVVDL8HnI8c5LriDL7tPU94kHXfbEMe0gs+xWtL8tBpnLOipCF+3Zu7EIQu9RrLJtv1UOIs6iDnm3cW/C4Jo6SZyovGwrqaDfaHYjsZUoaFUyqqXPHsaHXeXk9U5BRPlgmL5XD1r9FDKi7W8fkvWDr2MC7r2tBrav9VhT64hXpgDY8keN5ptrXuUKOip9KsLeFMNlHO29rxY3C2Qny2hqxySLauCyEQJrHntPkw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RQnLkqYdk6YkEonuUntve0eqWmFD9IjWYBHIQopHdQGftAsItHTVv1WhLVy40yegyjZRWHfBE9f6UXaWCJ2FNMFxgdNUpUL2S0JaC52IO6vlWvo5zeNRs6hRNlMNVQSGKRVzanpT/Pdbo0uUzEq/zyag+KXUzrjnqghwIcZPMaHwPI4DldPq56l44/mAuhHAOMsc+vn5U3WV5dIJYCaJ0hLoU4LogAtMbpi/hEQtX5AxKi1vDqoKe5qXL6NAEqMJoplI5G+KdXu8up3FB5J5fhrlhAmgL5pz16E5h8GoF71OBiu8Bi5bILj0cnvElwM7NlGFEjtqp04ENnX8X95dPEW07gv85QO4ZtH0JcuZ5VtHarCpQhIK5jyqU3+LoUeKuzbefUCnyn89BmzV6mMBVqqK8tsTVFBcUqh/OTpPrHeF5OUyXKvLP2JZ1qGPVZt/T5QD6tG9+KK0zeGOu1fWN5p6ntkvp6j9TK42i5tVA1rQXTwTJa488JbEQFz8TO5DJ3cgBVx/uZOIAzSsAPeSLrkfYI+LscLfS4qph70Di8SX85GD5y35kcLOvoiUPUMScbPxcLzqBJPeP1fKTytlQBSZNmPA7Nq1SVoXHJV30GiiDrWrZjfc8CNSmUUXRV3G59Pre2uc6ojSBXh7kli43FyjOmwanrLKBDY8uF81qhJ9wZ4S8NB4sEE+syxWWeoIhPnNZD4IPC7MY3hDhgbG2wkIUG75N3CzaJxpjPLcDHjWebK0/Kei4o3gEFqWw3yPxNKnP6Ugzz9+E98nYso7m11Ar/e9AWY42PsHIULb1z2+Y39IhE6N2cbzzgTM+m+uQxfuuv4YRsudTWdoVDSh5/6Ei4K/z+15/vNN0GekRv33uVPK4iwq/TSSlNXd84l02/XdaWSiJX7KKlVWnGN4KmhWLKJzit+W0KpnL67tDeD22WF1ghx6JrhLLPc4A4G/GF0NKoMoQ0BKXW1xhPj55Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9f12857-3c53-4e5c-c673-08d9d944b469 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2022 23:05:35.9189 (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: VI1PR0301MB2560 Subject: [FFmpeg-devel] [PATCH 24/25] avformat/matroskaenc: Avoid repeated avio_tell() 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: FHzzSlx5T3oZ Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 28c7dee9b5..230bbf4a2c 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2503,7 +2503,7 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv, AVIOContext *pb, const AVCodecParameters *par, mkv_track *track, const AVPacket *pkt, int keyframe, int64_t ts, uint64_t duration, - int force_blockgroup) + int force_blockgroup, int64_t relative_packet_pos) { uint8_t *side_data; size_t side_data_size; @@ -2529,7 +2529,7 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv, "Writing block of size %d with pts %" PRId64 ", dts %" PRId64 ", " "duration %" PRId64 " at relative offset %" PRId64 " in cluster " "at offset %" PRId64 ". TrackNumber %u, keyframe %d\n", - pkt->size, pkt->pts, pkt->dts, pkt->duration, avio_tell(pb), + pkt->size, pkt->pts, pkt->dts, pkt->duration, relative_packet_pos, mkv->cluster_pos, track_number, keyframe != 0); side_data = av_packet_get_side_data(pkt, @@ -2737,7 +2737,8 @@ static int mkv_write_packet_internal(AVFormatContext *s, const AVPacket *pkt) * so we force it even for packets without duration. */ ret = mkv_write_block(s, mkv, pb, par, track, pkt, keyframe, ts, write_duration, - par->codec_id == AV_CODEC_ID_WEBVTT); + par->codec_id == AV_CODEC_ID_WEBVTT, + relative_packet_pos); if (ret < 0) return ret; if (keyframe && IS_SEEKABLE(s->pb, mkv) &&