From patchwork Sat Sep 11 06:02:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30112 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2167978iov; Fri, 10 Sep 2021 23:04:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwnk3xjOu9jLQHymfvN2d4YlZO1Nm/aPOwXQQenrZotKJyguBrFQQu1QJUuBFEKgswI3oXA X-Received: by 2002:a17:906:d04b:: with SMTP id bo11mr1334409ejb.513.1631340283107; Fri, 10 Sep 2021 23:04:43 -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 js19si1193685ejc.737.2021.09.10.23.04.42; Fri, 10 Sep 2021 23:04:43 -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=rYgq3pwl; 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 8209468A5D1; Sat, 11 Sep 2021 09:03:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12olkn2093.outbound.protection.outlook.com [40.92.23.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA85868A5B3 for ; Sat, 11 Sep 2021 09:03:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NUlQpuV+dQqI06zPtty6RY2U7w7KA88emxMfdrogOhxPPWWBt7C81++Eh6rG42WdVBQbNmdLdKD6KbjT3+OV707d34iu6L4XXnd9AQIjH/1ex+ynThUmHDKm4/Spzpqy+4WF6TOVxMI81RmF4uD3v0E1juGwQtghxsMmT4ZBNUFh5Ngr3GwvCYPmqj2jCd1kqIsNDsQ5wcZ+DEkiuNQWYAHAZlFC/wCfUByP66ZuFiBL9sVFrZAoRQsoK4x45UNyX5uYO2PnwAO/oBrqvWQTvRKzxTPxQylUwsHd+1rO0e7Qt4m3uSfArSvstovY2tNHBv+EQofchIzQNkbgVSLtfw== 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=YNTgLLGNBKUUb3WAyud0n5L+3ZNsnkurbLE7xQYFQWYQxOBnLdh/aNEu+e5qjIvBabZO4fK5leKr9LGm5WZivXR7v8DJM/z8Z0eeUssi2Zp16j4bar3ggAKN9MV7vFtNJdHYsSweGGn4EU2FLSQLBfeSxAzsaP+VNrgiV9Bd3p9kU8/sx7v8GRf5gQqCDiuGWRKVSKLTWel3UE5ZS31+fNKaID5TPiyQxsw8gwmT8ObV8ude9r4MbSbzkDezlSWf4vLuw0xVeeKDKM+t6dLuAAao8Ryw69cW8fCeXeIJSc4lH1wAa9qkYrrchDj2ffQUt2dYowZMCIsZv/i0WOF3WA== 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=rYgq3pwldrZTIWnFOAUKchzwRO/iWcQAfwr8upTXpQwjfnL/FMuaRsaKwNSZhhkoDTkFgSSkcmtQzTgMb2L8m5ym50JfvF19is9ePB/NTkMNfhUVwQEnyAOMYJ6rHHciDunyRHQrahiiHQPZ6dDQb8E1HemEcgZfN0+DaKU90f8iYQe4kR2y/G4p6RzR6hJ1whGq8DnpP1+LGiGlHuIBrjIOpBhhUXiHEuCSoRfvArbR1Ku0u1hDi8DVtsq4Qo4MgdOzetp8m1xJ/JL7LQQhitovTbvz7+8KJkpd9Z7vXRZ5uJs0JpIYcRdLQFncRD16UPVbISAkPeST+mfrcK8Rtw== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5629.namprd04.prod.outlook.com (2603:10b6:208:a6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sat, 11 Sep 2021 06:02:50 +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 06:02:50 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v3 07/18] fftools/play, probe: Adjust for subtitle format type change Thread-Index: AdemwSKXqpERtxGbS0KgpcR2ktb1Fg== Date: Sat, 11 Sep 2021 06:02:50 +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: [+NfgUQzAtVHN0J+ombL54JvVCNx462ygtAFJ4dKKEJw=] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0bb4def9-abe1-417b-1f79-08d974e9c9a4 x-ms-traffictypediagnostic: MN2PR04MB5629: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: npCc9B23DmwAexY9JkSq2K3ObeaAf4wdN/WQN5mmL+TF3k+fYD5/bm8pPOqpgjn7chBo60ZyJKTUmyMw+7fsmfKbabQr4WOW7e9X5m4En0zB/vcAb4UK+io6RUwk4MA4j6EbJ5ogsws/P2lNL132rkjvTSJvBR3VZYn/p1s1NOCjBDSPeJd6pl0P3WKf7PbBtKIuaukVLbf261gJh97sojyjDwtnn2XOcWCTLCIzILiFeE+7DroiMa8CS3UdDZd2gph2SbgkLQAHOrnYiRzvD3Z5Cd7oo0DLrTdqvc4Wika1LNRngy/xbUL1tyan3ZeBPTLYYkwCk9UwSEdRLBc68CLH7Rth/cycWGj28Ymvf6oiUG60TvGLW7HJaBVeOb+SADvkU/qIfJiPKI6gBNKBI5AYiQ85AffmWQC2TTR4+FYyV4IMA57ZA1kD7qRKEP4W x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: G0YsS6lFm/bnQua9CTaoz4F45vvis6rH0fr8YCMgklE4zT7f8gBuAh+5Ewd8WJo0T/1OgiVfotAcuP/9yuWhXUY5mzvubVMyW3U/pmigEh3bszUVJsRlFXlG+v0mtGRTmV3J3vXQhLqufUsyWPt6nw== 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: 0bb4def9-abe1-417b-1f79-08d974e9c9a4 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Sep 2021 06:02:50.7934 (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: MN2PR04MB5629 Subject: [FFmpeg-devel] [PATCH v3 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: MbSnDLcIE1qb 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);