From patchwork Fri Dec 3 19:31:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31929 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1097226iog; Fri, 3 Dec 2021 11:32:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJzMkFkMC/jRDN8W62iDZrwAS6Qirm6+wYKDDCdtPkRMkESbNIOHUPOj1ac4TPY8u9sf/GDc X-Received: by 2002:a05:6402:4302:: with SMTP id m2mr28968157edc.349.1638559929007; Fri, 03 Dec 2021 11:32:09 -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 gs12si6288800ejc.584.2021.12.03.11.32.08; Fri, 03 Dec 2021 11:32:08 -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=@hotmail.com header.s=selector1 header.b="UHfbP/+T"; 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 0D7AF68AE9B; Fri, 3 Dec 2021 21:31:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10olkn2068.outbound.protection.outlook.com [40.92.41.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B4CDA68ABAC for ; Fri, 3 Dec 2021 21:31:23 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g+Q/qpNLAHdyC2dn0a1TR2ox+HLmvXBQsssG07TdMFzTF9IxRTf8JglhXxhw2hgzNc4XWqWSFLcMWhJRcL9LEW1sppWl4nrSPMtR8j4lJ6YugZGuM5HGNPtisscrwLH4M1Xlvek/JsImYlF9GQrjnHBHTnXXCbKWul3ndSVZmq2i8RSCq+67qMfLeL/RBarL4faKJga2zTh63FNHV3FOihMPqkUGK5VV7C1PvbOZHsCYJKOkndw9MWbB9StJT1Lir5qoPPqbUyzB4F9n3oaVEFImkNvbfC8bvbm7x1LVbUbw1popwdwsaP6dFheyBZUfo0cD9ocJCq50lMzq3X3ebQ== 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=u7ZBVmj7SXVzrquAEgRhu1e3m+DXjjm0GGrP5OSdbEo=; b=Vyq6SS4I3tO+MFoaphX8ONAbFZ8YVbOVXneB2RBHQE4Fq0VHOQbHAAzzsuMe/v0SOtB/kB9AWeP4GFwi8tOx8mLmMyh2ZeO++6CocOLKrwlY4qHTmwJProoAqsCUT24HFzhWrzCDeSup0PGCJy9Qo2Oq2hdnmG4l82MInjdSRbJksm/ZZR2depOylowEw/InwVhpqdW9q/4bCm9rLjSvIvO2h0dr/Q7818+cF3TZrpH25UTavM8ugK1VwDZjAq3A9vJcZfBCA5FhifLh8JppLH+eTBXCSFk+sfz/hoCuD9pq8LXASKRfHQENLg/EISiU3HgFl1dt6Qy91l+CZiCnQQ== 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=u7ZBVmj7SXVzrquAEgRhu1e3m+DXjjm0GGrP5OSdbEo=; b=UHfbP/+Tfjmnrts45k9G8l1jzCd/TEPvllhDP446xbN71KJdZd3QEsw3RGTvf5k1fdO5VKsN/bMcZiz/+kgyNI895dTtvZXU4p3XJD9oG0620inII9Yj+riqITf8HlH/fjWuLaG2CiY8Qrtvk73kogsd7rX8OLZfoxliZ9+H1ZKKbMu7kH97CaUzFImzfsjkI7KWIcCRPdOj5PSwcZ7YHroqVXGhMkHDRYZIuJvrOWiLRqIURghjEDU0G5FnzBvoiVjgQcPTwHtw9ZZjRHQaaYkCYWKuMW8DBMiEHMeWqnBN4kNaHSkdUC+t/XBT3zxJtpg5VkdHiMh8wT8Ssgam6Q== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0333.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:8::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Fri, 3 Dec 2021 19:31:12 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775%8]) with mapi id 15.20.4755.016; Fri, 3 Dec 2021 19:31:12 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v19 04/20] avfilter/subtitles: Update vf_subtitles to use new decoding api Thread-Index: AQHX6HxU6k0ns7R9ckOXwsAXS6s0lw== Date: Fri, 3 Dec 2021 19:31:12 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [KHBthAlGG/ymjy4tWSkbgB/0ut585MZR] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 72f7f687-8320-41f4-eec0-08d9b693771b x-ms-traffictypediagnostic: DM8P223MB0333: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ZvZDBJEFY9MCbpRSg4JwHwh5ySFtTPCtIDn/ExldJK6CZKYjJKZQ2fmCrdYRoaVb9Xq/YbR6qdurLRcfSYC3jZ1yC7XvUKl6YK5mP9HceTs34usvIDhnu6br6ruMl/DfmbZ07149cOGh1AH3r2mGeO6PGDdwSOVMZqD7oH3vkiM63CQhPNVO+n9BfVTOX0Qni36mjGswyyG9wVipGv0vKTRe4Ot2GA3QSQrNWRLEaxzUABcbFWW90NXgK2bWMhg5rM9SB2p14LkForgYQopAzLLMiaKlObHyMTuqfXDYHP80hAA8JCPwj78ZUfoHf4negnmkX0b/4q15EcH0D6q51o0Zf6qN/3ow7PQsW7HulGJXTJlvRxLbHodyBAot4MC41n0nzcZ5XpTIrPBJz6jT8d1c8JASZ2anKLUttX3GDvITymp1CXRtCXEukVYH9AgNTpByDw9XHMALMpi+kI+/GVrc3PFy5DEFhxg5Z2Bi/1bumvDWPuXTZ82PaGSbUvE0DJ/w/29+DrfTRB5D/sXm+rsw0G2QqIV6zHGR966Z1Yx6/BgkUBv8rBFy+GTXib7htKNvumBCSimLaasFOTQV+g== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?S+vK5WNceZYILq6cEnZF3VsgkDAt?= =?utf-8?q?gUf49nlXNmc4jzl6PcV9iXuzj1z85eaadgbSkQPjhJdTjszDHiRpaeQRhaEXQuo0v?= =?utf-8?q?XzQD1aLUbYXBrap1xu6jSR50dRG25h/xL7naQnr09xnMS91qhYbZio2gAEXQ842Z/?= =?utf-8?q?yw77hkhvlxpSz0dbmpu/90aV+wPQilX97hQ37mFJxBZXoQTL9GXjlYytoSz2jJGrO?= =?utf-8?q?3x4VvzVHjoKfshdNERhDbuAT0+m87tS/KEz7eBRqi7wwoXYIDjZwF4YLf3miapSXm?= =?utf-8?q?ORIG+xI3rx5FwbQ2i9GM4NeOuu8xFTeWJpZn7MbcORoVgnOJV4h569zrti5nE3vnz?= =?utf-8?q?txNFb37Ulc5+q9s6g74fxyHRCMjgwE3vbP4Kokvj/HFjV6+ZqeuIxSxHYrJk5BTGW?= =?utf-8?q?NqpMlPgdOjjUN7YtsFoW0pd6925T/cHte4WEeHXk/0V7P3UzjPtwZ5n46Z9MikTd6?= =?utf-8?q?hcVatu1V0YdStSWKm2zwVyJvkls57S3Y473eVnVz69VD1NkszFpukAbY1NrbyAtkb?= =?utf-8?q?q42fbaXAH1ljMcZoltEbwovM6j6bqPanaZYr1Rjxr3CHyNOpOBw5zaghya4wS0tiu?= =?utf-8?q?mCLPVeHQxyRJgavT80PHTWM5yX1KnIrgL1AnwGBIXhXG57y/KPxnfSFOhH83KyjSE?= =?utf-8?q?mMbovF9NQb7M92w4SPUtOMjRaN1GGe3UV7U53u4K1QyeZoGFZ7I5wAiAtn9SNDNye?= =?utf-8?q?qCbatF/hd92MXk4MdgUEzGpVNZ7WURBGD49seCX8kAWhSFfY8+wvVCpoIkAWelW8D?= =?utf-8?q?dMMhLTINBW4VVVNKXXNh7Xn4ASFdY5Xv6tLcYQZpPcxtW1exl3E3dC9Pr3c4cwOL6?= =?utf-8?q?DakW+FpNcnoyXr2DqY4XttF9E4JV7zZpZc10GIj0NksrJiNdoiyS4M/HBr3OwInx9?= =?utf-8?q?dvjrgIyul/GzXw5DCxBpmJxly7HLgfyiuQE8PomVB4oA=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-1ff67.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 72f7f687-8320-41f4-eec0-08d9b693771b X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Dec 2021 19:31:12.3626 (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: DM8P223MB0333 Subject: [FFmpeg-devel] [PATCH v19 04/20] avfilter/subtitles: Update vf_subtitles to use new decoding api 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: ej9q537mUnHw Signed-off-by: softworkz --- libavfilter/vf_subtitles.c | 54 +++++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c index 377160c72b..a240cbd415 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; @@ -292,6 +290,29 @@ static int attachment_is_font(AVStream * st) return 0; } +static int decode(AVCodecContext *avctx, AVFrame *frame, int *got_frame, AVPacket *pkt) +{ + int ret; + + *got_frame = 0; + + if (pkt) { + ret = avcodec_send_packet(avctx, pkt); + // In particular, we don't expect AVERROR(EAGAIN), because we read all + // decoded frames with avcodec_receive_frame() until done. + if (ret < 0 && ret != AVERROR_EOF) + return ret; + } + + ret = avcodec_receive_frame(avctx, frame); + if (ret < 0 && ret != AVERROR(EAGAIN)) + return ret; + if (ret >= 0) + *got_frame = 1; + + return 0; +} + AVFILTER_DEFINE_CLASS(subtitles); static av_cold int init_subtitles(AVFilterContext *ctx) @@ -306,6 +327,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,13 +408,17 @@ 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 = avcodec_descriptor_get_subtitle_format(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); @@ -448,18 +474,22 @@ static av_cold int init_subtitles(AVFilterContext *ctx) dec_ctx->subtitle_header_size); while (av_read_frame(fmt, &pkt) >= 0) { int i, got_subtitle; - AVSubtitle sub = {0}; + AVFrame *sub = av_frame_alloc(); + if (!sub) { + ret = AVERROR(ENOMEM); + goto end; + } if (pkt.stream_index == sid) { - ret = avcodec_decode_subtitle2(dec_ctx, &sub, &got_subtitle, &pkt); + ret = decode(dec_ctx, sub, &got_subtitle, &pkt); if (ret < 0) { av_log(ctx, AV_LOG_WARNING, "Error decoding: %s (ignored)\n", av_err2str(ret)); } else if (got_subtitle) { - const int64_t start_time = av_rescale_q(sub.pts, AV_TIME_BASE_Q, av_make_q(1, 1000)); - const int64_t duration = sub.end_display_time; - for (i = 0; i < sub.num_rects; i++) { - char *ass_line = sub.rects[i]->ass; + const int64_t start_time = av_rescale_q(sub->subtitle_pts, AV_TIME_BASE_Q, av_make_q(1, 1000)); + const int64_t duration = sub->subtitle_end_time; + for (i = 0; i < sub->num_subtitle_areas; i++) { + char *ass_line = sub->subtitle_areas[i]->ass; if (!ass_line) break; ass_process_chunk(ass->track, ass_line, strlen(ass_line), @@ -468,7 +498,7 @@ static av_cold int init_subtitles(AVFilterContext *ctx) } } av_packet_unref(&pkt); - avsubtitle_free(&sub); + av_frame_free(&sub); } end: