From patchwork Mon Sep 4 11:27:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43523 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp1138609pzb; Mon, 4 Sep 2023 04:31:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGIcZisEp9RFxp9zwzVsfW+Ml5RoGVFsHKycTh5074LLQZqUDkiMRplQ7hs4bo/FK73E9S0 X-Received: by 2002:a17:907:7612:b0:9a1:edb0:2a7f with SMTP id jx18-20020a170907761200b009a1edb02a7fmr6383444ejc.6.1693827097720; Mon, 04 Sep 2023 04:31:37 -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 pk24-20020a170906d7b800b0099279210464si5926947ejb.420.2023.09.04.04.31.37; Mon, 04 Sep 2023 04:31:37 -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=IGEEcuNA; 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 4498168C7E2; Mon, 4 Sep 2023 14:31:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2059.outbound.protection.outlook.com [40.92.59.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B7CC168C07A for ; Mon, 4 Sep 2023 14:31:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FDEhdy6Jdh/jXqf9V3qSJEQ03RPeVDbXEcMda5whbe/H7ITwdKn2jvk31K6hDEB51Lxioujf9QYPO/xiOgOByCJ4W8Tny8wyp9tWjHhqRbTJiC+QcInmUyDnkO0b01RnGtViulofKMUDB1DKuvltV7evztDaXAuIx4Dv0Q/Y6oEq0nzCGMX/SEj2LUj/fEWqHX/OWmx10Lms0VI0lhMkyXvP978SvA4YbipPlGzYVtXPsSiJREfI8obJJBL78eiGgYtW9oQXm8mrv5wJIA9a6Cb760acivesYL00mCPaMV5gEXUtYywGlsJVjv6P9i589+PrsVtPErRJ2TxlXYLKEA== 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=2037hrHIVYz+/KNV2RI0w2/qMWBD4KUoGtKTXX3n49g=; b=nqNWvqebmeVmMX5V/G4iy8okbTmlzoYZpgXXHpenLva5Agk2zq89WXaG7wqSwb2XKm5+LBc2YNMMMMpP8DZDI8SNbeqHzOIv0LtETtFaaXmChCe08I/GyEwdsYJE5zWWS/PzztkzLLQlvmKTtkJmWr1JIx/0ez+osHVG4bJti302qNajbTd2yPPSo/PnC3qmC/KZTaEJIs1xQbQkqiTPNAq3EtwKLr380CI4JNbd4SO3n/L+ZGK0TqJy+/Oyu3mXV8BMJwrtmXk1nfioH1HRXPtTiVsUVnxN4SubFLf7fqnaFl1k1BejFApdwhevseHd1riD+tQFa565FqkWG6X0jw== 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=2037hrHIVYz+/KNV2RI0w2/qMWBD4KUoGtKTXX3n49g=; b=IGEEcuNA6z6menv4Iw32uriK+6eHCh3CX5FeSYHpbI5HH/L0RqjUSFNytslqsm9AlgtVc3wYQqyQCyBKN+5Bv/JvPYXMk4+dI5i18NlneyGQuYZWUWuadVQljpcNkGji3TV8IfefDsT+fNFHPx+BeEK5LJaKYohscscq13fmYVqw3O8u28kGjzhWEn8iBQeZ/ViAyzt7jduYefsy93kkkxR3RSkbDNt8JFKFSalCQbDdfvrnEqAMjV20vnplhEokmvkG6fJKFMs9BO6u/5Ng51QCKNPXyN3+BdkKwVguMPuFp337kLB3UP6T3KPKUpCuF42ocJLsfGYW2bSauthccw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0017.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:3d8::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.32; Mon, 4 Sep 2023 11:31:32 +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.6745.030; Mon, 4 Sep 2023 11:31:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Sep 2023 13:27:58 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [W1USlTSQjoM5ZQlz7Xzj2a68g8BXBhd10yUxAI0DrII=] X-ClientProxiedBy: ZR2P278CA0078.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:65::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230904112759.2652347-18-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0017:EE_ X-MS-Office365-Filtering-Correlation-Id: 825de587-422c-41a4-e3d2-08dbad3a7d01 X-MS-Exchange-SLBlob-MailProps: 70qbaZjg4msS5Ik6K0Q5QnvM6p6iC6nwXopWeaaFdaZBjtxXlhbg0zSFaQmCMiKY3rJYd0AU9nfdymXPRfgm8WqMvn1uOYepk6UjSZ09x4E48lHVwu/jsWKc2rbCZpx/YjzR85ObDfBtU8c3jSgEj588XgJ30KDLTWpRKKSa5uzHIYSf+SgWZaORerx6SldttWZ8JMWe4eKmwovCSE/JSRQuAgoulisKlmg/PNOnkyrHBEHp7fSMIECjqqZtgJZke2+LhsNPbfNEKCbU15E50SJtKVUFMwumDXTP45outxYyDU8iBIE6M1kc3O9d0mi3NXcmyEc4huIKcRH5qDe2tn9eEfq6jrljn7Dn9fNsckHuLaxVd3TVvTbpQcidmYmh7TT7E7A2IoAb5T6iMBA+ccSqbVSW/n7ghG3r5gnPuzVFLb2lMailgjL96EH9cKetoU2CeUDKHVD4D07noKJdqIyruCBkY2x/A2t2Hm31x7YFxbSPfSyGEa8uGocZJI1KXG3ytx1pfMNGofCvT1wvYfFf/hqWuz3fWoFmnGhj+V42VV7dCTCuVwaKOJBV+kKk/VB7htDtOmKDXUFywtzQdDTTKuLxfvdwHFN5JThI1ePFrzAEREWnSb4Kdec9aF+8hdFkW+MW3WlPGDHOxLB67s2ZLi/3irRDm0TaSd9kgPq6yywzjP5uCfXWYY4Rcsr1mxe4Fjin8fbMRzvqMF5QNIlWbQ96I2fvKVhNtUSgIVfputeo/YlH/w== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mz0QhPe9ml6k1CieXyZhrdJNzREexHY1hbNHFtwSwQKLzSCSfjvvPPtJsGxPjiOQtKxSQm4fjSSFFjjmItkHVlOxyOoksBzX2Ddn1U2YpJAAIVNXnS/5U/YP0jkRUVW+/mleH44dbZy+krVeGnqUGvIxcFnvk0mBnS8FBs5WM8a2PzvGDC2PzA7nbAxsR6IWsR5yZ+27ZxcyXDslQFzOMlRQ8W66A4p856YWmGyl6ddnNdzl+XUSDgbihPXP1/+DiU9TFHSs2MFgorpmCy1pU1xuZGY7e4Du5Bt2B/CTZGizToMeq9V1zywDVTACSD4yqnx7+e4Y3aZM3riJWIbwJlV9xoSOvdFDU9snohsMm+GFNzy+Kji9Me9GxurSNE+B0k8kq1sudfz2QgSKqZl83yc0bekC7gh8+Vtmxu9d8SKczAwJtfbk8M0mr1z107ZJ/1x7o52qxAMYtj5BrPtkAEEVXk2K7q4jQ421EWl9PYuqQ98MnzrKH8RAwCo6cashdH8Gs7hIDzvW8M5AIF26p72Xxe5ZOk9R/KEU4dJi59ZJ7AfqIRD67idKMmnGcxmn8sDmBkM2AbwQSDYRUPazhDgXOsVpQDG5WnTaoPXTpZo8pchaeO1526VOdluLoFg2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tbKvTF/sugpeMOnWsIFFAkpcvZRkg1CXLoIcOOebcaMm0hW/IrHLoGT3qTUtmcU7Fnkng1VjQYtw9X5yE5A9VWnQVkRcfbDvfHwqQuEsyhNAe1T/KnNCf/PC6LGS6GrT95q6Pxs8GLgwKgGHx7QaSTS0k0xXadMAsn1LAtyUt7amK8VunNo6KaNtnzX4UZrzSPRL+Zz9JoggyHABm/jkPFw0LEkv3jfE6Fh6AIeHiDFqtX+J6GTEzvcqNTGeTvySEzTkPuXz52YYhBIi1YnPNW1aVYzAUeDVQ3FCKCZ3vsXCJyphtpWIgpNFyZ5RSUg1lJC0lAaUX0NlaaSYAwW4pWMuSu1NY4ZJosy7B6zbzDiZ0WlQzdosZY1LoJFJiYGR1iKO/uWJQaHLTvnmniOdAMfZfregc9y9diHmPukXgUlxO03Hm7qtVCioqxNMs+kDBadbwWevEzyOdX1731hSAO2bl3ui22pLbQNAxWwH2gjbxwUvGkwODnMmTPeryunigHIjwWXbRQc7qdowXiBA0Fy0Dbo67wUqbM+3qb6SgMydj6vgIZf/HOCDbg8F2tGNPrkuj8oy9wXrNouqMI5LZ5auDi7ngl2Iy0Y39tCJP06toN2fJX1mT3SgyvhHJZ+nWkhZL5tuxH34HNN65hDeLQA+hn5RkpR/V9v0h1QPvbbXGUci/n9VJjQMJp0OdSrsi6aEa9OMstDJ+yIyq5j2L1azNwfowEwPrp2dj+DTQWcKJIY4Y0lepYpTpqgwymTtxXsw5aKojYcSBIzVv24fDCSnKGcWiXjOeOfttrcrEGqsGscjzb8Bnf7yfG4f0RUUJNjWM2Bx1LyPcJxK1SZRHIfQ/C/FJqpl29p9M2E3Uz3dZrt01Ryp2vR3lpqWgwQz1arxlPGwP6+9SMxzZCpfy96iZZL2C0poPpLMD4knZC/Fo6t7wKdhCj6mw4eE0HI9KVJ7htrWygP0bw/jDtZlSBah7OcFyDENttV4DYi5ENipuPfNpAcpxiEpc/Fglc58ozU8ZVmkvRSCDKcNGJJ9ZEpmtRVLUKkXvDIr5z4s1VKTwjZ2Vx/VsQyIBNNZHgoFqzE33I13O7amYca52bpeGshlBiOj+2HvIOLM4y8QNkgLUiGmmbVYGudHunKEIrhjvWMpc4cpLwX1DYnZYEaWBUYM18vbzojeAbiU527exKtbcShA8m1K6GL73LaHC0GGjPBm7FBZ/mUdp9IgN1W9FSak3X5uKnYRYNRczeeGnVBDxydPoJnyC80kE1+gugrH X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 825de587-422c-41a4-e3d2-08dbad3a7d01 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2023 11:31:32.2276 (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: AM8P250MB0017 Subject: [FFmpeg-devel] [PATCH 19/20] avformat/matroskadec: Move WEBVTT code to mkv_parse_subtitle_codec() 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: cgCjYVDsEboZ and also perform the remainder of the subtitle parsing directly after mkv_parse_subtitle_codec(). Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 49 +++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index d6545fd30d..51c47e9404 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2948,7 +2948,8 @@ static int mkv_parse_video(MatroskaTrack *track, AVStream *st, } /* Performs the codec-specific part of parsing a subtitle track. */ -static int mkv_parse_subtitle_codec(MatroskaTrack *track, AVCodecParameters *par, +static int mkv_parse_subtitle_codec(MatroskaTrack *track, AVStream *st, + AVCodecParameters *par, const MatroskaDemuxContext *matroska) { switch (par->codec_id) { @@ -2984,6 +2985,15 @@ static int mkv_parse_subtitle_codec(MatroskaTrack *track, AVCodecParameters *par track->codec_priv.size = 0; } break; + case AV_CODEC_ID_WEBVTT: + if (!strcmp(track->codec_id, "D_WEBVTT/CAPTIONS")) { + st->disposition |= AV_DISPOSITION_CAPTIONS; + } else if (!strcmp(track->codec_id, "D_WEBVTT/DESCRIPTIONS")) { + st->disposition |= AV_DISPOSITION_DESCRIPTIONS; + } else if (!strcmp(track->codec_id, "D_WEBVTT/METADATA")) { + st->disposition |= AV_DISPOSITION_METADATA; + } + break; } return 0; @@ -3001,6 +3011,7 @@ static int matroska_parse_tracks(AVFormatContext *s) EbmlList *encodings_list = &track->encodings; MatroskaTrackEncoding *encodings = encodings_list->elem; AVCodecParameters *par; + MatroskaTrackType type; int extradata_offset = 0; AVStream *st; char* key_id_base64 = NULL; @@ -3174,21 +3185,32 @@ static int matroska_parse_tracks(AVFormatContext *s) (AVRational){ 1, 1000000000 }, st->time_base); - if (track->type == MATROSKA_TRACK_TYPE_AUDIO) { + type = track->type; + if (par->codec_id == AV_CODEC_ID_WEBVTT) + type = MATROSKA_TRACK_TYPE_SUBTITLE; + switch (type) { + case MATROSKA_TRACK_TYPE_AUDIO: ret = mka_parse_audio(track, st, par, matroska, s, &extradata_offset); if (ret < 0) return ret; if (ret == SKIP_TRACK) continue; - } else if (track->type == MATROSKA_TRACK_TYPE_VIDEO) { + break; + case MATROSKA_TRACK_TYPE_VIDEO: ret = mkv_parse_video(track, st, par, matroska, &extradata_offset); if (ret < 0) return ret; - } else if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE) { - ret = mkv_parse_subtitle_codec(track, par, matroska); + break; + case MATROSKA_TRACK_TYPE_SUBTITLE: + ret = mkv_parse_subtitle_codec(track, st, par, matroska); if (ret < 0) return ret; + par->codec_type = AVMEDIA_TYPE_SUBTITLE; + + if (track->flag_textdescriptions) + st->disposition |= AV_DISPOSITION_DESCRIPTIONS; + break; } if (par->codec_id == AV_CODEC_ID_NONE) @@ -3204,23 +3226,6 @@ static int matroska_parse_tracks(AVFormatContext *s) memcpy(par->extradata, src, extra_size); } - if (par->codec_id == AV_CODEC_ID_WEBVTT) { - par->codec_type = AVMEDIA_TYPE_SUBTITLE; - - if (!strcmp(track->codec_id, "D_WEBVTT/CAPTIONS")) { - st->disposition |= AV_DISPOSITION_CAPTIONS; - } else if (!strcmp(track->codec_id, "D_WEBVTT/DESCRIPTIONS")) { - st->disposition |= AV_DISPOSITION_DESCRIPTIONS; - } else if (!strcmp(track->codec_id, "D_WEBVTT/METADATA")) { - st->disposition |= AV_DISPOSITION_METADATA; - } - } else if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE) { - par->codec_type = AVMEDIA_TYPE_SUBTITLE; - - if (track->flag_textdescriptions) - st->disposition |= AV_DISPOSITION_DESCRIPTIONS; - } - ret = mkv_parse_block_addition_mappings(s, st, track); if (ret < 0) return ret;