From patchwork Sat Sep 11 08:29:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30143 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2242913iov; Sat, 11 Sep 2021 01:29:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx4WX3Ek/zLMz/p0siaM0DVsYT8fzVf0Tx7Z/CF8KoFH7hj9ukbpST28qf4sFhFAyASuCtY X-Received: by 2002:a17:907:dab:: with SMTP id go43mr1923345ejc.96.1631348951234; Sat, 11 Sep 2021 01:29:11 -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 z62si1690104ede.453.2021.09.11.01.29.10; Sat, 11 Sep 2021 01:29:11 -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=gI7nBTI+; 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 7287C68A7A1; Sat, 11 Sep 2021 11:29:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10olkn2011.outbound.protection.outlook.com [40.92.40.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4287C680749 for ; Sat, 11 Sep 2021 11:29:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XciWfAKW+HZBq+NUpxducyMWzPtA4660k9iV9S5/3aVvKwyqO0eOWZPOYRT1OvbVJQFgw7UNdrtIhfHrqIzmzO2Voc+uvmHNMRMGdIOghwZSzjtakwfpxADOPBfkpxptlQSmXOwsuEaKZOHXNi4/zDpv/2ya6InANN0KxMX9oksCM6I8dcVTiAiah/gpbbUtYgdDyaQOK6DPwFUM2kl29EH2nH/uh7JpC32JJW02/5zpLZL0wZHMtTveWuYgqigGI9JbECAEdoh464DmUfnRSm77klgZl99kFYm1EVhO1IDEHaJ7NgiU0fuTY5197cGJRsZC6khgKEb14t24TF3yeQ== 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=r+hup3rD2ogE+HRRcnrpGdrxYxV5DRZQqKTMnWccXXs=; b=aXvemRPQlaM5Umxxj/fRJbAYyEDBot69FlwIibRR4IOICHCqAUKAh43HKo32vQj5RYwNTH9da4CAjfDH/em7Ec/vFGDeTcCngqF2T+6B0uMf/tMA6TGsgm53rEsHOJBR4HNrocJhFqwqNwwuFQzbYuc9DLvZoj8ELoImnTSuAZCgRqouSsndGNynnpWKtihcjEw44iKqbMDkbMyyip1jgHoiESFJmLODk/LRRfgcyWd+A6TjXfnnlmmEfCLZZmvTn97NczCcKLfO5Yo5ItFEnTOCLM9aGFQUb+Mz519RxObdN2icRxcnZyTHDRkb/4bD2d0w3bCVbcnBjpbBXrmyVg== 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=r+hup3rD2ogE+HRRcnrpGdrxYxV5DRZQqKTMnWccXXs=; b=gI7nBTI+kYiqa5IqDQLM+L3RRiXPEG9W6ESuZ44VEhMqP+BEenu3mgHesPyGefgVT2lRkxrVOCncrKhfgG/2Gut4tis6TwK4OpclHqiEmFpHa8doQm6QeUz8odqO9A5ITVN84pMrPX42gO9Ov41LAcuunq+S03NEjki+aLIupfhqGA0xsQ3N+58px0sNG/R5m5Z/RYugjrzBYkaorcHtUoMtVKqv/cArK9lCYGHb/+HrZG3VBEHaru0PdCUWFe6YFTSqiGelKew9MIuBoXc1krooDMDBfxrkKiVJfc1s267DXTTaLdstQn4tH1cg0KfV0CkJpSZFGntv09zXSnBXoQ== 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:29:00 +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:29:00 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v4 11/18] avfilter/subtitles: adjust for recent changes Thread-Index: AdemwY1JS5PTqWAgQmamgyI3MDhDJA== Date: Sat, 11 Sep 2021 08:29:00 +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: [dUArW3twDzig5Y+cX8EcgMh2lXt1ApALQ3ZL66PXDZk=] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7c482e10-cacf-4fb5-73e5-08d974fe34bc x-ms-traffictypediagnostic: MN2PR04MB5549: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ovqv1qf3elAVK1Gcp33OVp3v6ZhW5DdxJVzaQDHaKIaxmBJesoHYvWKtETYNSr44TP2MHk00dA4SMvajm5663IX3pLSRruryCe7L+qDzuvSmgnWeneBqV1oMiIhlTY+xa/qXiY5SFdn6uA3RayaIeGm5n2J+spFuSelZVpG176X/CH2zrioHqOzEaCw2QGRJ0E4KETHPMR9Qsh9gZ085i6xDRf4u4jBqjQRLGs1sSTanfeML01wwE5tMYKr1A+Ni17Bh/XwbtcLddxKCDsI1UBHWz+8RLtrh/XO9aqtAds7eMeTCTbSqpIQbQaunFqpCCJbBvYqjq7d/AmhN1eKCxiwfwqAlh2evwyrVWBSDgLnXIvIJYQCl2ZCUNmpsSJSbLv2ndcSqGAm9F3FGX0BBQZoj2LfAdJj2BC7m2o1mI44q1ulJ/yRvCXBn4WpFmDlA x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: /A0ZHBvgh4gmkPqmqzBsVuxcOUVzrXpbuZDtbuTj96xPq8E8PFzuCQsIRYDb7SYKzVkiJZzUZrX0/jdrb5ZRO+tMVWNk3bhySrUjcIabPtkpY7eK6oS3aKgQzW2Pzjv1E4mWsUceFA5MnenwecSLuA== 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: 7c482e10-cacf-4fb5-73e5-08d974fe34bc X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Sep 2021 08:29:00.3997 (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 11/18] avfilter/subtitles: adjust for recent changes 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: ZNyZIXRKHZBj - use new function av_get_subtitle_format_from_codecdesc - change error message - remove obsolete 'sub_text_format' parameter Signed-off-by: softworkz --- libavfilter/vf_subtitles.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c index d0bafcd3cf..200fb18165 100644 --- a/libavfilter/vf_subtitles.c +++ b/libavfilter/vf_subtitles.c @@ -35,14 +35,12 @@ # include "libavformat/avformat.h" #endif #include "libavutil/avstring.h" -#include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "libavutil/parseutils.h" #include "drawutils.h" #include "avfilter.h" #include "internal.h" #include "formats.h" -#include "video.h" typedef struct AssContext { const AVClass *class; @@ -306,6 +304,7 @@ static av_cold int init_subtitles(AVFilterContext *ctx) AVStream *st; AVPacket pkt; AssContext *ass = ctx->priv; + enum AVSubtitleType subtitle_format; /* Init libass */ ret = init(ctx); @@ -386,16 +385,19 @@ static av_cold int init_subtitles(AVFilterContext *ctx) ret = AVERROR_DECODER_NOT_FOUND; goto end; } + dec_desc = avcodec_descriptor_get(st->codecpar->codec_id); - if (dec_desc && !(dec_desc->props & AV_CODEC_PROP_TEXT_SUB)) { + subtitle_format = av_get_subtitle_format_from_codecdesc(dec_desc); + + if (subtitle_format != AV_SUBTITLE_FMT_ASS) { av_log(ctx, AV_LOG_ERROR, - "Only text based subtitles are currently supported\n"); - ret = AVERROR_PATCHWELCOME; + "Only text based subtitles are supported by this filter\n"); + ret = AVERROR_INVALIDDATA; goto end; } + if (ass->charenc) av_dict_set(&codec_opts, "sub_charenc", ass->charenc, 0); - av_dict_set(&codec_opts, "sub_text_format", "ass", 0); dec_ctx = avcodec_alloc_context3(dec); if (!dec_ctx) {