From patchwork Sun Jan 16 23:04:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33634 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2274330iog; Sun, 16 Jan 2022 15:07:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJz4P7CaYEZRRsz9grNADVlxYSOkNRccyCT9cfvyjmXaNu3aOR93VYS4TBp2el0DziubPimI X-Received: by 2002:a05:6402:51c6:: with SMTP id r6mr18183510edd.129.1642374474322; Sun, 16 Jan 2022 15:07:54 -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 gk21si1163722ejb.813.2022.01.16.15.07.54; Sun, 16 Jan 2022 15:07:54 -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="F/N5HbFl"; 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 ACE1168AFBD; Mon, 17 Jan 2022 01:05:39 +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-oln040092074045.outbound.protection.outlook.com [40.92.74.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28DE468AEC5 for ; Mon, 17 Jan 2022 01:05:36 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IvLVPTYhoAxKg7On6iG6CvS7QMGgZiPrstBdw/av3+7wkWEYcfs1jY5/ksg38/9fb2R8VIXimGLNmEHBzE+E3AV/50qL19pwDfP6nt/zu5n2XL9lBlq/Pr6U6hCgebJvZbUlE5//LSjJ9EVNLT39NgCugi+8W3PNYheeO3AELWfh5zfOL7hU82NvR7R8FA2pci1wXJqWnEfLOHPM5aZzTxKEKEceaR7Pnhn0uZ8nHc5xQGWtGjf8YC7MYagl2wsPeUXAVwuezeBxjUABamfopBTjzabvh2oExhiUzAq0ajiRFgPMx3BqxvvXVOE8YzF2UqW7UYU5ElCsNGJ1E196cQ== 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=f+U72Qu+GqNYYvmkRMpy60ZMfrzdgHk9UeRrBCMwOzI=; b=WihppBrd1/wMVOmQzQJp26eP7zlPWFTvs3zu3OuHc1dcj6Yu9dxgc/PqLTqEIMc3uduz5ziGkyq0XW4bBiQxKMVVFBMdNvtTg/KaI6Fy6RQdLZXelf2YpRnYNgDOUlMkcmJ9oInD/HgLAJwFx4uY2xzF4ViMKb+HkTKLOvin4tg/QD+ZSZSEErGdjCQHWOi0WdxJj8oxRNRtjsO4tUZi5jjiLkrXFeK7khKv9R2CEQTrteRgj4FtxiQFNcJgph2TCIYt8JEG2JchuPaXgvwz6VzJKVYeMpxKRljqwi+RVIz0S99hcmh2pz/GMd/yy2UuNWiEVMYCPbHgtu8CudltVA== 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=f+U72Qu+GqNYYvmkRMpy60ZMfrzdgHk9UeRrBCMwOzI=; b=F/N5HbFlg0Lf9HtZZcNtkhEjtIohvoOZYAL/2I4HFo+CwS+CmI4bcudOLOK3NUrq1COSvdgoO+0YElkh/JhDB1Qa6wLCJ8kY0qBzUUIv/W/o0OdScGsjFypzKu6m0GhnvbJ37x1ZGsbiSKzIDcmaWCYBU7PeHpurGunjYekx4uvOalnx00DYY4hib1Y3bv4U1K8q3Gn39D28s1lB1AN/mu6ZP14hMfmSrIwoEv2A64bdbAJweMwkuTKdTHrWBcqhm+1IhrjTqlpw8L8A93QYGgvBZ0qGDYdLSKNkbdQFudmka+yCkArO6H5DoPKbRsqzpXIIwhG2Oaqoart2XKzPHg== 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:34 +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:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Jan 2022 00:04:03 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [yHR2dOy/6vlFpvM05kcxj3p4GY9uiSbA] 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-22-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dcab43dd-31da-4349-3c07-08d9d944b393 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNX1vi4Zzd+e+QPZzdfbP84rM9U0WtbhDJduYWkyBM0ZSm912a5xJ5pHGv4LPnks42bG+xwRUeF6PUBXSP4K3MzcymeNlM1sAtGkP+Otq+VfmdkC8UU3PErRSemHFcGJwSLepaosVYfhtyXV4VwohuIAJQlFGqf7qnShXSsthYW9SFupFn6VymaF8lmSvikylXE3WiiUUExcrzLFvSBjjoivBtcZkNVoz/NX0nq6DeH1EA45juu9Pep2MEc+a/ZOL10DBE2bsw/XhkelDzonvuOEjnaD2jXUw+URoMs6mk1IADNqNpOZnw3E+HrUBqUYyEnIZ5EA95UxgL9g8U+2Z+m0EYhacsuISiUUILsO7xHzSpIYAkvBByqWgYRUXyPok/WYcne2dvj2J7GDi9pSgToYKt2kuCoBmXXGVPV/YIASGs/Gv/NnDl4JxMCAzd8zFjwa36JIJX1iv5N8PR8H9Jf2rF6K4CPnYScNPJb5BEZnD/2APh4sqVr4poqSdI4zwGPfw9PytvJ2N6m+XHVVNTUB+ne5zQax0DGq35LzS3VNoub1XdN8pfEksx71PPH0CwP3od+qcYxVwX6My+BjRW0WIwu0QqKvoJ7zDQmqr7Ujhze8ThW4IuY2Y+SLhULdyPKco6Kf4kx0uZjFSaPEyBLh3xgFUFA0n/+LVwJ+XyAN67spyvNVKV3Th+Z3+XAJQ7fIO7MMINX/u8ijVQMebZa72iwT+HEYzjc= X-MS-TrafficTypeDiagnostic: VI1PR0301MB2560:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WRpHo/R8KKmN9IdE/3YLNvL8ERMMmNMdvrbRJU62qidmYeAXInlt+OHQa+a7Asj4gET8AW4Jq/mBhxOY68V2dqsYHIokGq83TPKNBOr1v6rYRUNeSmWpSIdjdJo81FgjEDQolB21DrcvzsfxTidHRoW9YDrOk23N6AHJ4doj7elqDTbt51LrXyMH3GMdpKFUMZYFlDq/ebCoq+H8zHFU39Ry3C8IMUHHEKS1erXlKrSSIWIACe9U0N8qTOIBbDzHlsfVWG7IMCkRcvukNJIcQNYOurmsv0YCKdDYoiXi0l+bKV3mVDUuQVp/nAaRMx8Ko7irjtc3DK9c6xEgEoLnFTHWA9uysoUaFPbK+Rogb92G4PQTfsDx3RoE3h88rBMzf7Uz6xGevnivUAticFI77vDdYDiL3d0mRrlzCJ9zMq53c+NyYjesl6M/slJ/1y5JSlGM0nQYIuiP+dTtOLKyqJnT+FmF8enU48rUHK7WDVEoQxHtcurQKDjBtLux9ToZRUnP4THfj9QdZ+EQkpOGDPmvCsAhOBnorOIzGBC1i8JnaaHW0GBbkyat2I98aPPeQInJ1fLu01uSav1gHIHOYg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: M4g5K0UDcIiNjb2MCwxZ0K0yfMBquKTnhaPsQFGIVHyfwM1kcl4s2ULZITgqJdnZMssbSDnNOJWoMZvOz+PdgfMZxbZxyMiGlPVYBZR0RYtP9EUJil4NqO80PiZ1UU1LvtRBMn8nkRIuc4LAwhVa9lT1LGNBsiDdI6nHXZ0sZCrnLRNWeOgVHfob6J5dp+w8vUy+dyrWmzU7d9NscMiy4uuBC2nidTt8GAtgCjYSnLVVHtRcEQvu4TkNmbSIeD7ZgWyF4ymJ9KQbKYaEqlXlp6Bnzo1tTmj8E985dWaZoBIHscu43hQUruSE21OnFm49V5FUtMDrZP9By2SbQ+eEYZIY6EQNZ7zyRrr2Q4sV53CM6Y38C9SeC50spc7GABl9DQ3ree71lcwEsgTfZPkV2sRWc6F6nIr7vW3gYMrbQ/NYuNaVSlG5ydEHLVZjyJajAtWoPCObENPooH9TAlh3w23ZYlDG7iivaJH1RVowcV15xPp5J1eb6AeE/GeEyXbZh4r5IMuipVEUFo7n3L85aEs8CuSmAOUqFtC6qapZq0QjZUZPUZdjIC1QJqzXMC1Sv7G7fyo/nxjMIMY1NedaBQwZyjw+nSmF/JzVBCDelgNCih/Gnl0z0P29X7sVZhun8po/mXx9rhGrHX1SsEByNd105Zotxo1ubcHvXf3qboFgHd1J5qgQqlaYZjNRNUqDOXxUKH5g18s717sWUW2jnaF0X051i6Ite7+6YKFGXt0/YyrHn2gwZmY5gIFuqIOmcPMAvregOBSj/z7dEQn+ypZQg8WYfyf2N/5eOvn1RJdCO/6Ri8WrVlNTD0qm6CyAoU/ABhSyULTzPi4mPMVL4khDn3F1VjJXH8TZmQ/FpXu2E0B9a1/mCezFgNZQh1yc9OS2FolQRAGMhhBD1S443EFjzI3FzLBwQEbBfCjqNNVqLF0LS86q6JkGdPfUNduy1ijtdmdGSvi4+b6cdvLJNA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dcab43dd-31da-4349-3c07-08d9d944b393 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:34.5129 (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 23/25] avformat/matroskaenc: Reindentation 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: JFG+YUoGCOoo Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index e2f2dd7dae..28c7dee9b5 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2735,22 +2735,22 @@ static int mkv_write_packet_internal(AVFormatContext *s, const AVPacket *pkt) /* The WebM spec requires WebVTT to be muxed in BlockGroups; * 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); + ret = mkv_write_block(s, mkv, pb, par, track, pkt, + keyframe, ts, write_duration, + par->codec_id == AV_CODEC_ID_WEBVTT); + if (ret < 0) + return ret; + if (keyframe && IS_SEEKABLE(s->pb, mkv) && + (par->codec_type == AVMEDIA_TYPE_VIDEO || + par->codec_type == AVMEDIA_TYPE_SUBTITLE || + !mkv->have_video && !track->has_cue)) { + ret = mkv_add_cuepoint(mkv, pkt->stream_index, ts, + mkv->cluster_pos, relative_packet_pos, + write_duration); if (ret < 0) return ret; - if (keyframe && IS_SEEKABLE(s->pb, mkv) && - (par->codec_type == AVMEDIA_TYPE_VIDEO || - par->codec_type == AVMEDIA_TYPE_SUBTITLE || - !mkv->have_video && !track->has_cue)) { - ret = mkv_add_cuepoint(mkv, pkt->stream_index, ts, - mkv->cluster_pos, relative_packet_pos, - write_duration); - if (ret < 0) - return ret; - track->has_cue = 1; - } + track->has_cue = 1; + } track->last_timestamp = ts; mkv->duration = FFMAX(mkv->duration, ts + duration);