From patchwork Mon Nov 29 19:48:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31803 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp6641925iob; Mon, 29 Nov 2021 11:48:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJyYc30dXOl67ZOFD/4ckGJspJFXtIY52VgOf/M3A/xUdzT/6drm7lUHz19+Fmny9mxTY9KD X-Received: by 2002:a17:906:90da:: with SMTP id v26mr63386984ejw.442.1638215334284; Mon, 29 Nov 2021 11:48:54 -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 jg5si34648096ejc.752.2021.11.29.11.48.54; Mon, 29 Nov 2021 11:48:54 -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=AvZoUFjj; 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 1766D68A868; Mon, 29 Nov 2021 21:48:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08olkn2058.outbound.protection.outlook.com [40.92.47.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4715468A868 for ; Mon, 29 Nov 2021 21:48:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eRU9fxLtLLOSxqndyrmHHUwVfG2mNMwgAGubxcRIItgP9esA+kbgYiZvMddzBRDgSmLy04TD81hIZmVtf+M/oWvtEOYyGXzo0krRLBc5TtpW8zy4esT9jyBu6u8LTX6OpEpkVVRnIi/F7dYCxOUXBa+2qdm1p9m0wnmSKCyivqWOKEwONMmq2O+Ja2SWqekWpUztv2A8sLNzhgOf7zniOrQ7RckZmP/OF3camSEpArPMSj2BTFsWBW9S+CW80B5MDObJLeuUIWjfG6hvdXxvQGey2KFBg4bTdJ7C3XO0LS+OAKRsrrxdqFTANWsVbAeAO0gw2e3qoXZvJ9XoM4ApsA== 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=AtJXCdmH1W5GmUdSrkBRYibD/DG+HlwCa/U0feDgguKIGPEjY+67jq73Ajt4Rx6krvpHPKV+4hRhi3K9EzdkMJmXAOhCfeUojdnJwFfG1uFPyZWWx7Vd97yjKo7D/DBdv6g/ZF4vKjH30MSYb7O4JUbpK2QsvE1tRyIAyN9YZt3vscwDppa9r2gQPZewvRfhESpoWwyuA7hy4XiEyQO4nQmQsRVS19HBABmZcuk/tjEEDGg7BT7HPW+mUH7jmi0RwpPZniitBHxO83wbGgtbV3LW/JpPXrY3fO0ePAntpJ+eFdQJumR3YEthlAlfJKhmR6agOr+Ryoj7GO6fvEowIg== 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=AvZoUFjj9TsOxRMKBwIkS7G/WpsF7UjM9G8ah+fHYhNpFTC9AQan4XAztLIdtS85uKjvNkaODIRIDAB5yBnCqFmLNayPos/HyBdHbksQb9ArJyDgec9Ag0f72awmd8BmqxZ2O+6ejZRM0pkvPufF28FnOvA0rF9qhm2gMn5Rwrp0K+msveQIaQWPV4wgDbqSmPh1+OoSsDM7ubSxvFoGCdrHo4h1rYx9/wECbPW/tOnuCZ8AaG4kq/TaMybJvSK2NGDi06U8oUczuR8HR9sVjlzWWxzBrZn9hdlVMhD6quwmDQgFjZjzwDMMEZx+FKrRJddItKCyHnfoy34ciFzjPw== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0223.NAMP223.PROD.OUTLOOK.COM (2603:10b6:5:316::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22; Mon, 29 Nov 2021 19:48:02 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775%5]) with mapi id 15.20.4734.024; Mon, 29 Nov 2021 19:48:01 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v18 04/19] avfilter/subtitles: Update vf_subtitles to use new decoding api Thread-Index: AQHX5VoENwCPAaP97EGDe9mn7gGlbQ== Date: Mon, 29 Nov 2021 19:48:01 +0000 Message-ID: References: <01697a451703d7b506c60d75c953dff19bbe05d9.1638214931.git.softworkz@hotmail.com> <3d54150a3bc909d1c4750ed07a00341f5c04ddb5.1638214931.git.softworkz@hotmail.com> In-Reply-To: <3d54150a3bc909d1c4750ed07a00341f5c04ddb5.1638214931.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [rA1UAqOgM75+O8qIYJmvrQUgcDqlDXSy] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1a0c4a40-89a0-4067-d24f-08d9b371272e x-ms-traffictypediagnostic: DM8P223MB0223: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: RuQI6Z9fgcAJi+VU4skGenI+eU5zWC1tYlvyuTMKnOVRR2+6AZ24tR63GqbCuDi3UK39P7gk5hZT1ggTitdPttytbf80HSOhbRWE58VCRyBFtBoy0NlKGu97MaiUuaEjl8R761I3ss7BPSgs3KGl105sGGZXL6ePBosX64swdBxX86pfzfQ9tujI5yUXPwNdV7iVdg1D1Vz9sx39aOoCGbfC+p5vgsSlPjK+96NnuskpOPsrsIrTdDlUvlbfZdIYAuqWjPTGvA3lMo1JWIPqP5NUPYm46f2dQiQUHEvREA9xxborwVTBfhDD5MKyB6c4U505wh6877KfRjPsFAXHsGdyILQuvRwEGHpqxhw266Rn40g8L7w0kF2Gkay9oU6cLh/+iZdLucrWOhfnS7lhmLzykp7t5ZNCD+inP4ngDXnDPi611MJez4EC1IBw/r3WG/wYj6qoBx5/XIoRh/ycdcjxAedpPVLLEZ8Ijnoew69J5n92sGsNbyoY7hmhAEuJ4mi2qr/57dOSso33EF6T3gmRAQ9fyXtPdzHdMo3AarL3hZMzF1ppBcsPFb5pPDTxvcKL/xfPSLdqSJF9nyTYdg== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 9cHvNQIiGUN6VteW3jQteydEr+gHKk/QiqHnM/BAPR93+ryqyoDfybin7om5ow80vEq9yR0jur4kikmIpO7xjOMc3MJaaUrI36yzMhowEaSOjK/zi0adsIezjNx9z2ywgZWzzVhZjnkEhr6FNS6/sHPZ67BDLI+HNsRd/v1JvRVED+nUkLmZ046faUJP/hACzTvI0KQUPuc3zuELzLWdlWHh5NDbcnRwYXmgoXoyywc3EwIddK7rSIH+fwFrNHhdfdZVrgkenf2XYpSNOEkTTWvhx921NBNRX8rKFuqoBfyZRT0DZTzov+JL+K1m+d7ysqrIteMHOaiuKyaO70riO7q4Fjelb4Bf+eWxqqvIRANj54FwXeGsKC2+fOPVmGzaSnZKGtZLoNADcyGkVZgv2+Tcu9l7ktFUnVjZOLxT1GD8VWzpkyjjZsVOrGXQRuVoGtHt8kA0+rhYNYYKcNVpEb53I8mYpf/MCMRSs3799EEaemGSBO8CrFCUm5ZN1/IP/aX1EBv6iocdrmEArWI3X1zyZYl9V9TZb8WizwiTn6k3T6XJzMrHTcTf3QKnURIcFbUy1LzYWCyrsZsO2vjeDE7sLOIHYjMbFvGu182m5uJjjM1tz45Nu4gN0PGBYxynp75LVm5jUbREJGEl0rmyhdumcJTsirL1A3Sa5/jwiCJTfisA/Wbq5TPqBjh0dwypfQ3OPmhRRcEYYrbRAciFQA== MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3912-16-msonline-outlook-1fc6d.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: 1a0c4a40-89a0-4067-d24f-08d9b371272e X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Nov 2021 19:48:01.8815 (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: DM8P223MB0223 Subject: [FFmpeg-devel] [PATCH v18 04/19] 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: jiWsBVR62Nx3 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: