From patchwork Sun Dec 5 16:23:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31991 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3440147iog; Sun, 5 Dec 2021 08:24:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJzA6v2jzT/47nbvdD2iUsf3KHr8/ZXHws+gah0Re3l8AgRx8SsbutHmNHB1hB9yWnsCg91e X-Received: by 2002:a05:6402:3590:: with SMTP id y16mr44840220edc.343.1638721472001; Sun, 05 Dec 2021 08:24:32 -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 de57si13031657ejc.129.2021.12.05.08.24.31; Sun, 05 Dec 2021 08:24:31 -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=KmTV1uA7; 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 E126368A255; Sun, 5 Dec 2021 18:23:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-MW2-obe.outbound.protection.outlook.com (unknown [40.92.23.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5AD3068AEAF for ; Sun, 5 Dec 2021 18:23:45 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eEgTixkb4QArxmWsY4SWsfG0DlHgMIOqeB4yS5/1NTu18vWfI1rPU6L6sIR1LQqBM+91zNHxgDK2BCkc54x1j4MvUuL3niamEwLu7qQ9+LZDTUXbOaKqnzOt79YgUox/j8ZM10Kr7CNhRLPzrjnyZyjsM5K9IAKnzASx6uNPRScFAGDg4gTZXn2vJaYmPXD/l/2YQRuqjhx6spTxz3WZBMrlgMDxEtG3OdRnWIoyz84lW754SYH27j+t9Z6sQN4TPk+sZItvObFtpHXBKsZ9X1+FbZyZxWTW/kIOGAFz/UgRPLhyxldQ5q3hL4572l79S2Xf3SXDp6jW3yUjmPcnNg== 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=Pov0iZZW19g0L69c7I5JzbzlKP2tzx/85Q87+yuRZ9UwGVMYygkrRdQTVPw3HPlctzIxKskEChWRez9eOszP4Rg4TYFRRqyB7owXthmHMOWBf1FQqQG3B4D1ee4jetbEhpxyeRwlk6tvuuQo0Ka5/SXoxG0wCLLQ2VB2B55aB7V/As4OmgepUD2B+SFewO82UGu9AxUeuMJIQXnP5R4dCUcqXoDS7fURRaKknQ6pn0+nZiGOgp7lfzECk5r4yhCI1qktmoBZ1Q5n7zXLGN5I8Nw0wQ7yEsebCtTklNsx6oeewefnn7QHoor1ibnb8vvZoeZ8S54dwA6OLkFclAjsFw== 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=KmTV1uA7rvwIpMC0STC+clO2GjDCWmlaTCafwCbaFH3+Hi4606PU6wDM+CCuxslefdBHX6bNN5LI4iENgFzZSpeiQLNWzTEcccZhH5MGjVDZaf7kP+Dc5rqy2Fv/1bEq2VDD3of8cIPRdsVdkT/p+mZNYz7sTtbhy49WS6svUc9T05mcLjUCDQaGUOXnzP+2QLDKMvjegrLiBHuAJBn2O0ZpYTXTk9X7oEUUB6qZGCx+iAHHpSVngbnlK9kI5g/T/MHsYNknDYbgXLwlmAoscewTQDmbRsU/hE2iyihgBhBAfcLxigrhHxxbRp02cfEHC+RTPrjNvG6SuBfiFvfpgw== 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.4755.21; Sun, 5 Dec 2021 16:23:37 +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.021; Sun, 5 Dec 2021 16:23:37 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v20 04/20] avfilter/subtitles: Update vf_subtitles to use new decoding api Thread-Index: AQHX6fR1Mtl/wvqfr0mS6c/ZBvcDIQ== Date: Sun, 5 Dec 2021 16:23:37 +0000 Message-ID: References: <7795dfe8ba792c0f4f7f8a543d4df8adf8d8189e.1638721292.git.softworkz@hotmail.com> <4cb24bff6e1107e2275b0d28cf798b014aee3b55.1638721292.git.softworkz@hotmail.com> In-Reply-To: <4cb24bff6e1107e2275b0d28cf798b014aee3b55.1638721292.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: [xIje1mG5H5BtXs/2O/7ygTWw65Qc/mqnPSxGXvTRoHZqutqF8k8+n1mL9AiOMLee] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 2dcafefe-b8d5-4a1f-8ad3-08d9b80b97b4 x-ms-traffictypediagnostic: DM8P223MB0333: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: x0xITphTstdod2jMvGKnNc4jNTsBMADdmoQ8ooKOd5A8Xjr8QsQdm49jwVpd96GgWKFKJfL/VP7zuy5mu6TdzVDkR7ytIDhxtT117nVKbC7OABysU8ouAlAdA43ip0IjOViUZYK5df0vLFjYYuJsYTKUtCfF38IaGkQ4Afa3bHdR4RWk95pNXhSybORwubtaCC7klQVsmSEjMFYb0/wyeNWqtB3+zqkT8koFSAufJYIUUYPhe5PrgCB+y9/AZrSQf4N0xyRN67x617oIbALAGOqCWUitF3hatpL7l/+4GXc31572VzEoeM8o7iL2o3+E/HxSYKsoyzL2stsOmmdDsV4BqGU33HRS2FxIDsL3RhnIR8ic8wijMhjDYmM9+HUlv7lTwFIAoWA8a8df6Q5+7wXNRlNaXHDOUlUXYFoYXQMgd+P1gqSkmFpYXEknYYxBw4sf/XAKOY38Kfyv1HEkhz1r9w86ES6+LT8ClPT3isasgD79AR0PJ+LFQv8cPMFOL7sh1SiK2G2TbMA7MNXxAbkVwMCF8eu+N87pc0xP1hWZSDUM2iQ4Q8PVn4LXLmMqGuPACvrVGbb+aLt3mrOrhg== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?cBwhmM5oFE7TqtrEwGv9yrSUBdmx?= =?utf-8?q?6GLwbtNQH4Zz8J1JLJglgHLDAdbOWpl0wT0b0IKACshoziLbHR89vdPvB+G350Bmw?= =?utf-8?q?Bpe1dFc0MCM1glR3WHEBksKaks+DbeR3jLexdduwTfDc3TtyFHxzYh9/2cY52gCcz?= =?utf-8?q?+xev/qmj8PxJK/deM4tZhUJChLa+WT3Z4STEgTAhwmbxED/xpzPhpItV+yrBAvZHx?= =?utf-8?q?mjBWF6CIp1mskrh+vFUuwFmc4PcgCWbPamyhlrRkxdm1PU+BH8+y+xqe1aXdTch9k?= =?utf-8?q?DT/2JQceiUYcWN0CP8gOur4Wbz3SnVy/+IXkDze71CBAvcbEO9rNw2cspbNuSIONO?= =?utf-8?q?s83nULl20ClfNa4fctL811UjdplkS1DMMRZ0xBSvLp4DZa+TFgMiOoDaHeFEX2frn?= =?utf-8?q?F+gZ/PiyCsILHLz0V80oyNYkbrLz3w0KWaOsq7aKWtEUDSXRisCOCBHPl8l+IDve9?= =?utf-8?q?ysr6cMwiUyz1k80rkvzEk7VVbrn2zdxIWmPqgwX7sXiVlkJvDTEvS3aFvWt1IvZaM?= =?utf-8?q?CLDlJCWOrzMs5G9wdJ/rN18IrLAVEX6kQQRhRQBmQBfrO5fp0BRKqL8KuKfngaMIe?= =?utf-8?q?htgX7ccqi9k7LX9neVCVU+CwyP6dNH7fnEEZkr8rKOFLhirO+sqf90NNHJtjglRlh?= =?utf-8?q?MtfnbMj5wBF8pGHwpG0xECZd65HFx6ezzT/VfF3c19Ys/6Aq9j8EqmlI5IeZgVhR4?= =?utf-8?q?sqfMGBcPB/sKch3dZg0KJXYMplwvaLEy09c8GvrgwR1JkigT4SC0V8kNzb74FdEuI?= =?utf-8?q?IRQkPZmWe9OGvHK+NdQxTQx9GApKKwa4Jdzw1HAtysVAsY1CwZJlzalEidZ4oNlO7?= =?utf-8?q?TQ/ZAFVZUeFA81kDyM0G82yGUg/+MBv3F5wUUTxK56jkM8JJDl88Sw/I0ByBKnFJJ?= =?utf-8?q?x/Vxja32ZIUFzptaV14eFzn1qQX0OZADP0PXxNJC7GAjpwAz9eEgwT00/h+RFvSMM?= =?utf-8?q?uQzZWzc6uo7QxfzFv4AGgoXw0zinos1nS18tXDZ+rAw=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: 2dcafefe-b8d5-4a1f-8ad3-08d9b80b97b4 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Dec 2021 16:23:37.8490 (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 v20 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: jlIn3jZzmEDA 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: