From patchwork Sat Sep 11 08:21:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30137 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2239141iov; Sat, 11 Sep 2021 01:21:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqSrKiKOHnDNj1eeSmcuJZYiyH1h9+U8Z2UqNsV9rTwar8YAnQkCK0bFjhe06juOVuUjO2 X-Received: by 2002:a17:906:2bcf:: with SMTP id n15mr1871011ejg.414.1631348502418; Sat, 11 Sep 2021 01:21:42 -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 ht10si1460129ejc.30.2021.09.11.01.21.42; Sat, 11 Sep 2021 01:21:42 -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=@hotmail.com header.s=selector1 header.b=lFF6fSoJ; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 60F1D68A6EA; Sat, 11 Sep 2021 11:21:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam08olkn2030.outbound.protection.outlook.com [40.92.45.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F2C2D6806D9 for ; Sat, 11 Sep 2021 11:21:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XSljf+xgLzO1FQrCz9v48DIVVd8vvokDSjZAqxBrRvtcHY6ObCenVYbe8kCgWB1kpCBaI+a1w5baSyiDmobdNdX762dDU3FZ4VII/medN4bzsu+ivg4e1CgdciEgMBfpwSSXeqBLnhmlT7OLi3kwNvyHIRhVhoL4h8TtGnoZIab59od2QZ44xuty0FQEp9LTo0SdUbQqXWV193+wgDd50xV+I9USkqZwSixZ89gsaLaBk+tkgk75bMabMxIE093I5g6DGsiwTvifkf0a40yN90Yj54SGpqRABl7ogtHaREeCBVCaBEy8CJ3ZwAEE1Y9fRnPagcczGkTlThR7+0tAJw== 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=mdnP4vNiSOIF14sCXlqB6GPZNiEbEet1qK1hSWjkmgQ=; b=mUT9meCV4e5pUpQxOKllvV7Mj42cEDUD2PKk3MnierECoXQkbLdSUNOF3PGruZWiKAk3VZwPiEnVKXXFno93i+GOIccJZXs+O9oxCwr7cKXS7kFJ3fjUyhetVb+Uf4pHeq0JKs0YFBRDUGHFdBntj+TxlPtScTMdmpkwJ41bqVqmWR2FxfD70ULZlw5xB5wEDf1zER/HQp7FLuLmbAzB04WWLudiUApJuHR9DDjWdMDCjpA6rW0Vu8Mds1abghSt0mGvh6fxXBN5t0/JquvyaQ6ya/5+8ZpfckiH/6Ql3Tr6SZB4dWn9ShHGSX0H5YDGXWqTobvjCRBDq0b7Hsly6g== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mdnP4vNiSOIF14sCXlqB6GPZNiEbEet1qK1hSWjkmgQ=; b=lFF6fSoJHUSZL0tU3ErKSWWVd+rxnq7Ivw2cD65Y3BbM05Lid29TroBIYJVw57jxmA4xRn8Vv+fLAwaIdrCHGMdAuuKnY8Eaa1bvBvUxDF9AXu+6Y2YzNwNVMjzq+QqKHUGDoYj0njGl8V/Gg++yRQcj/TmfWWjnG51px85EiIB/lLdItri3itu/0Su4LzTV8Ztkn1+qPmA+bf5cGBrvvfvjrNcRR6KyQ2KZ0Fxjqpu0uVS7Jiu+s8XkiST0PVSgtl+molgJYwyrpo47J2mRaLYbOxoLK+xiqciPm07NTZ7wnYRtq473l8ay9lUhdYahjp4MNSev2SrTwA8/kMx64w== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5549.namprd04.prod.outlook.com (2603:10b6:208:db::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Sat, 11 Sep 2021 08:21:29 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4500.018; Sat, 11 Sep 2021 08:21:29 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v4 07/18] fftools/play, probe: Adjust for subtitle format type change Thread-Index: AdemwSKX3JO3i8GIReKR94npt83c4g== Date: Sat, 11 Sep 2021 08:21:29 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [0662QByVUMb4coOEgmEkf/xISJrSXm9GJMkiOtiMc5o=] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d2911f04-9af4-46d3-91b2-08d974fd2810 x-ms-traffictypediagnostic: MN2PR04MB5549: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 3QcXJ72ssUOAPfd/hqgZ6oGmxpfMz4Y5X/J4HOaosXjh0S2Ur11SzrV5afk7dIqMsybzCF3h7Vxv2OFQ7UEVEIXBSEfilRlInV0pd15K3GdYtZi/wjHvwndm1CPF2fRc5s/7C2mgJdhy+0zyItDpUpURVAUpGjw3UsFWDqar44/rnO3AbOVjT/Dc5aHUpqgTs+0Ti1G6M5UDVdLbI58e81L3e4inNTjQBAK0oXnkJ75j2wgBdioy/gRGeKE6Z4I61IwZxlQn0Zy7PP2HOnrpgpaQWA7riObzNH0jGwEkHN1VvCgYtYN0dxu8qWTg8AWqjhRPgi9YbHsveHN8nHpvrJS9F2p+AJhuhqCAcznhYujPr/KpS23cyPFo9iEknQNbRNO1bvaLUB7cdLOAFWMTr2LbstV0HQ/RoNS1+YWa8DoBgD+fVF27qWFUCzJ2oc46 x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 3N/tvF0vJTT86bfx0xxiK4ZCQACxjLCFyUlHGVLbj8WP+bgbcTE8XaD0ftnS2FHnrRO9amW2rOub1LGWxdDcNXESE3Li99vcGn/CWy40DJ1kfGxOBhNUn235e7rAzkzxntwZ2cpppqeHRHqJW6VsxQ== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: d2911f04-9af4-46d3-91b2-08d974fd2810 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Sep 2021 08:21:29.6188 (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: MN2PR04MB5549 Subject: [FFmpeg-devel] [PATCH v4 07/18] fftools/play, probe: Adjust for subtitle format type change 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: aihNuvdfYAAs Signed-off-by: softworkz --- fftools/ffplay.c | 2 +- fftools/ffprobe.c | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 46758b9f55..f6a4d242c3 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -2250,7 +2250,7 @@ static int subtitle_thread(void *arg) pts = 0; - if (got_subtitle && sp->sub.format == 0) { + if (got_subtitle && sp->sub.format == AV_SUBTITLE_FMT_BITMAP) { if (sp->sub.pts != AV_NOPTS_VALUE) pts = sp->sub.pts / (double)AV_TIME_BASE; sp->pts = pts; diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index acfec09656..fb55f3b292 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2212,6 +2212,7 @@ static void show_subtitle(WriterContext *w, AVSubtitle *sub, AVStream *stream, AVFormatContext *fmt_ctx) { AVBPrint pbuf; + const char *s; av_bprint_init(&pbuf, 1, AV_BPRINT_SIZE_UNLIMITED); @@ -2220,7 +2221,27 @@ static void show_subtitle(WriterContext *w, AVSubtitle *sub, AVStream *stream, print_str ("media_type", "subtitle"); print_ts ("pts", sub->pts); print_time("pts_time", sub->pts, &AV_TIME_BASE_Q); - print_int ("format", sub->format); + + // Remain compatible with previous outputs? + switch (sub->format) { + case AV_SUBTITLE_FMT_BITMAP: + print_int ("format", 0); + break; + case AV_SUBTITLE_FMT_TEXT: + print_int ("format", 1); + break; + case AV_SUBTITLE_FMT_ASS: + print_int ("format", 1); + break; + default: + print_int ("format", -1); + break; + } + + s = av_get_subtitle_fmt_name(sub->format); + if (s) print_str ("format_str", s); + else print_str_opt("format_str", "unknown"); + print_int ("start_display_time", sub->start_display_time); print_int ("end_display_time", sub->end_display_time); print_int ("num_rects", sub->num_rects);