From patchwork Sun Dec 5 19:41:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 32027 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3628746iog; Sun, 5 Dec 2021 11:43:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJxcMAlbdnB5TL34kcSXbOEoZ+SQkHXlPRalZkuqAqpg0LBjB/h2mib0LwFWwlIYLWqD2rnr X-Received: by 2002:a05:6402:2043:: with SMTP id bc3mr48131117edb.231.1638733400423; Sun, 05 Dec 2021 11:43:20 -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 bo9si14476335edb.344.2021.12.05.11.43.20; Sun, 05 Dec 2021 11:43:20 -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="Op/Xvtv/"; 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 CF03468AFB4; Sun, 5 Dec 2021 21:41:54 +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-dm6nam10olkn2105.outbound.protection.outlook.com [40.92.41.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD2FD68AF7B for ; Sun, 5 Dec 2021 21:41:48 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E3n1tWnUHmPP6bILqYLIbEoTOFNkKCopwRyaNUt0BIx3eQ/NAjAd4FiwtMlQsPe7MaaIFEadepeXyLEUDqCD0SVfjkBR1S3ySl3+HGPIvaXVkFLQu2cl0rM33I6AfiP1VkU8tUxwwKnkLfuS7bobv/r6BlHlCtPLbVpvbjYCMJ6XfEB6GgqgAgHCEPCG5Tlq8SW6T4o85zlL4CVwZWbiHlRW7RRwN5wOzy/orCk0aRQsrevfMJDkbsSLQD7BRlmqKD3drRelD4T/y5EyMGNcHB+6VPq41IeK5HH17JhdWbhzIcED3RCfY7dGb4+TUoEbk58WmGsSB3019mzlvIYJgA== 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=hrE62r3blu5rKh7lm07cvBgVYlhbDJGQsyzMkcH8MZXeUO9RwyQsNst6MbaH6mXU9SX3U0s4x59syqzXI4aIHTJLSDVfgBk1Zx/Kzkg4tAwqioKPj+i0zEwoVf/kcYEqmoGYNUKxILhr5uD0ocVzanAbaG9xVUQgZ4e8YvP8FIZq5vWXVnFRHkvuHgCFKhA1xyMbdrI55ieU/KD+jidk+BEAgN80HGySGtaSvknjTAeRR4/wUAKihmJqp1QMnlcJnwdVLYB6O4SKpr6u64b3idWqzT5y3s8dWxPi/x/uekZv6wkVedw5Z+klTq2QqQmHaPFwXFgMNOcVc7F234sN8w== 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=Op/Xvtv/w8jWD/luBeFVSu581IDvA9sZ0VeSxWpJVhGpNsgELnDQvQ7lh9o7gwUYaILllG7OBTaT0Fe2CVSs9vUiD8rTa6Y+wV1V57S6JMy28pmZE+t3NQAk4kHp5tmuT0kwprPA7ZgpsbMU4+3t4RfXpZdUjnGwBJlbbw/H4iHYxhkFoqyXAPJKEGkGVHGgRq/eLcAF8thsxFB9QEmz8u7juVH2E4Cm6AtstZ0jSVDHzjiGp09NxThEe+V1T5066CrqTUbmr+dngj4zGwrlCTcAOvUEA1PKGLku7K04x1k6Y4oiYsghRmGe7uLVnT4XPUW6iOMbatHkubi95NXnIw== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0381.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:5::16) 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 19:41:33 +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 19:41:33 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v21 04/20] avfilter/subtitles: Update vf_subtitles to use new decoding api Thread-Index: AQHX6hAbBe6ynEa/w0y9pMfJwCgIIw== Date: Sun, 5 Dec 2021 19:41:33 +0000 Message-ID: References: <1bdaf4de8cf369e4a28e7a5d8be2870ea5e34b39.1638733198.git.softworkz@hotmail.com> <9fdc2f3e9bedd2ade341e81095496866d786488b.1638733198.git.softworkz@hotmail.com> <9189c7c58671e4d611b5a7f44c9db4b37416088c.1638733198.git.softworkz@hotmail.com> In-Reply-To: <9189c7c58671e4d611b5a7f44c9db4b37416088c.1638733198.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: [+P7JSgqTTzb1vEzO/24xYdq6iAUnY+cg7Eb8ZjbKOCtFgNZrVGgRektbDbgxH20b] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 57fd01b3-59c6-4507-0f54-08d9b8273e1a x-ms-traffictypediagnostic: DM8P223MB0381: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: BR/XRmz+HNfGlIXa3V0ji/270dlz2KatWLknwXcSpcYGsjaYenoizWFJWfxspt27/g3Q75n+DCLo/NT52myL4GrRxYBEnS2b5tqU+3Z69MWa8NYbJnU+MLOQDNXxF/RHXVaXbyc5vthZ5sWF49XdO2fycqPs+bk/zBSpvBai1NGYsk15acwavcaGifhXr3M4bt7ai6cBvZKScVhAtJmo0Jc/MEWmXCEBhb7i2HxmoyuJOM3pSpmNuEq3uv9nhIzKJ35Bssi1YWPHgzEa6KM0eB1Yglk4nwHTFrs+MsKMAUxM9glcoZV+0R7ihtcr26J5FFSEXMHNOgoDBkHFDd5ecHch9u6qmTbw5NyM5GnIZnCSujOscMTM2ABvj9AhGqqcsu7ET5gki90bgR3XePxr6GvoAXplFUrc0hml6QRB7xCdoJ1Duf2HcLlGneBXcnL8uyvVPCUXyM4+XsppcUpD/FaUBPlYw/i3mEj+naJ0Osku4sxbEGtMJDRFFG6ij4XyIn792275x4NeJ+xmcEFHEAMinBTZn0OpKGoWgvKxcl5Y29F30kBq5yartLfQshjWsXOZ4thTPTsc9bOMsdz3kw== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?wPB9Ve94rQPIiqISTn/PFjiWHcKS?= =?utf-8?q?99WeHaEWZTyJzsRhkj7rbpb7XloRsKejj+vwF0o9lU6MY/mxHn8nEDP54G9TD/Nad?= =?utf-8?q?fuxN683ATVK+fpXWsl0PG32AN3EU3EIVEqkdCnebwx4KenEKoqIqlmGcQ5bUckNnQ?= =?utf-8?q?4QpPrFKdgwIyQ9AFQ77cVXsPx4y00WF/UT9OTQegR77McCWokJLa7RFcgA20II49O?= =?utf-8?q?RIyw0EVSz5wAQuYrTVhyy9L2axd4Ex8rEdyyJp4ASCLLsdGcoTi1l0rQcIM6TdCLJ?= =?utf-8?q?53rEaJMySA+HwpI4uKs4/EpfXKSYM1m01eyNxlj67iD9vIqQPc8LSjt0Ol58dYOXB?= =?utf-8?q?ZiH8XzT7HRGNjp2vhF/rfhyJHkOXEM7aRbiYAK+UvUk8gcoGUYeFPN1hTom9CeIrL?= =?utf-8?q?nDe66U6z5DxyjUCsGGS+SjYjI1MFhspO98gHhs1Gan494j3JXnL176BkgzxUlyplz?= =?utf-8?q?Hlh86ShVDIAiuZWE8fkKEDpDC/pYHyKdR0ejmYpBcXkZK+niao+UDqQso0MgrZjUV?= =?utf-8?q?grZnLtzj0zkQzm1KXDGTvONKvXmGLyXmNnVYBKOu+pSr+Iqv29zufZd32L1NlPH8k?= =?utf-8?q?z6ULptgf5cMrhN+KdoOPGG8+AE7ToZtPq31iHWxt7b5TITsIWFm/nInSaG94OSiOL?= =?utf-8?q?iG+2xG/oPKp7iv2WfESJnUubug70RB/xUcNx1Nee0joPsAYUFXQAqbGWdc71gRSIJ?= =?utf-8?q?mjo2H5LYDjXB1pbyV3Gcf+G9ItFUg3KyR7I3C02uRkMUsPEHJrvnwBEOkC/THVCdE?= =?utf-8?q?tLQju53+bra1QZ8R0wix+9ckhuMeyPNXwHQw/q2q9oshbAjJ+sRZw2KDX2Td2Rmwh?= =?utf-8?q?yOjizZP5kve3wHuK5Nz6rHI3oU8wxRhxxBt+55EkMQhAzCdG56FWx/tFLY3oxBtkk?= =?utf-8?q?wG6aRV/eL/6DwVC/c2EEWm6Ezbn8nkhqCWDBiXbJqs84HFdpq4QDNcmhYgsQhnTFM?= =?utf-8?q?rGHEoAULPkA1HWGf1xwr4iz3zhlWaq6tya05flRbhtw=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: 57fd01b3-59c6-4507-0f54-08d9b8273e1a X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Dec 2021 19:41:33.3940 (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: DM8P223MB0381 Subject: [FFmpeg-devel] [PATCH v21 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: k3PoXZG5tqL5 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: