From patchwork Mon Dec 13 23:40:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 32455 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp6139142iog; Mon, 13 Dec 2021 15:41:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJzjmVUxsfewXhdNB/z4WMCBzt2nfgQDKBsL0sx2wSvJ3vZGmZDswBShStsy695xDbx+H04V X-Received: by 2002:aa7:c846:: with SMTP id g6mr2695201edt.75.1639438869201; Mon, 13 Dec 2021 15:41: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 he6si19938189ejc.702.2021.12.13.15.41.08; Mon, 13 Dec 2021 15:41:09 -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=DCnMki8A; 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 CDBBD68B06D; Tue, 14 Dec 2021 01:40:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11olkn2032.outbound.protection.outlook.com [40.92.18.32]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE67F68B05B for ; Tue, 14 Dec 2021 01:40:36 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XrlqaUicjvml301141Mrc4iAYBgyQVIEjxCvpEzZXG2MtApPpZ/rly2JbnWaxJjFmo5KfrPRSlhaW1L6VHEwlHqhE6j0tYXVYzY8kRpKWYjeG2HTbnSBar4hjysXBBUVL83pGAXMTbaQO6xuMm8w50gew6q1G4iuYSrSSh/Ueak4oKX5mYrqUjCh83HYuD0GogI4FqaA63yhCh4+MGFGAa/UQ/NkXCABriYdQYFlenMFKgvPAWKqzWTPwziXvP4J4rzOJkGkXBsPEmxemqlaoOx5WE/Jvuyz3eiH9zwnA5qLgmmhsqQ8iH5vQJKhlvfAXj/5K0fyZNbt41K23zVeFA== 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=AoI/EGlNnnc++ofMlMGwlI1pqDtONuV76wSE4f+/6Rs=; b=Gp1Eq3ApkiDen8FCJTybEHO7UsbG87QIdXUP5sMGk3H4kKU/rnjpDcH8Kv09GthUPEeL20aTOKWouh3kudLqmWNMbPVlavT26mrJAvATyWzKPbaaA2EWvrR8+yhcze3sc+tu+xEpGqngOy445X6ecsGQQR6hrAkVafUJEwvOwdkha1BnBCJ413yzXvQkE2ouySV+AcwVMxxvLdWHdCtWa36Sfe/W4NLqeqLbsCsHzaWc/iCMqvgB8YAj+B4mgBRYJVkE8u0zcAgtgHwGH00RjNS2iayFOuK63E+zvVlMLooyuQwESbQWwTIzD/tpJ633D/aDyTgAvj+o+kHQGsWKfg== 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=AoI/EGlNnnc++ofMlMGwlI1pqDtONuV76wSE4f+/6Rs=; b=DCnMki8AIKrkxn9G46CQeiSWBWU1w+2mKpxrbvpEw1MzZr3Tz9zZ8T7tpyBjUl+XfbKj75W2DD1N6CSz6aV12GD0l2wthNtv8OuEaeOxly7i3ebFdWRzsjmMLVoIedeiCk7xoUgmJSbBFUoTxHu+6AGbYo8K+e171Uam2TQ9v3OW9YffMwXoy6WR4QazAgH4VKSqbCACJHsNwYs8cZp8p21vMOxrSHOdAP0bmYmWIvI4Fw3hK8OpgQhG8jGISle8HyKpeTypn2AYZoMqh4uDY7cFeUk8bSY4aa3UY/CdvBT8dUh9Bz8Pre9ZV+8RZZ/W+x3UA4LG5zqPl/n5wuNABw== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0303.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.12; Mon, 13 Dec 2021 23:40:27 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775%7]) with mapi id 15.20.4778.018; Mon, 13 Dec 2021 23:40:27 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v24 04/21] avfilter/subtitles: Update vf_subtitles to use new decoding api Thread-Index: AQHX8HrOWYsH0y28PU+Dub6vZVeOdQ== Date: Mon, 13 Dec 2021 23:40:27 +0000 Message-ID: References: <1ef42eb01b3627bbad539abd46206f320bb39697.1639438462.git.softworkz@hotmail.com> <4148d77a82d4b7e229fc81ce9bc1bc06904533f1.1639438462.git.softworkz@hotmail.com> <2ac798924ee984010d2e85f00bc992d9aa106171.1639438462.git.softworkz@hotmail.com> In-Reply-To: <2ac798924ee984010d2e85f00bc992d9aa106171.1639438462.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: [ATV5SFEvzipgiN0M769QIao6RaqWIGOL] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 08e77961-f5dc-4cd5-3d6b-08d9be91f124 x-ms-traffictypediagnostic: DM8P223MB0303:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: TJ4caWznrDG4MFcYzCCM4tn/T8CUu40KJqf3nGaTUiOxtOP7sbcOvzh9uuTci74hSdtAcH/sYNHiaSm1dRBUMMr4w9Ayq5r24Q4clwPxzF6uBVriRIX3m71mMu/YkFKTh/4Kr2li2Luqq00K/e5S25sunqDPwQhMHgl2dUAfLhWePdhUo4S32EVmNWwlm4CyC5sjV4ewAzpeKRADMmCm6x4Is2/ukfehkrAUMdahRi4X7BEuslsdd27BppBOYAC66Q4snX73uIVetXM2QHSekmVCTkjeZXwrCEKIoO7fzOFR92I0kQu50zFZNgsl5J2U8z0496T7ObT1390vcRyFa0t1FPoOvjaZLvFvEbhek6crL1kk7sYODeeZEbqSu1G8+f7ClV2ioDtB4Lc9oD23ubR3wKm8tmspLYRRtRaTEGBWf2yGvlORv5D6Z5jsM2BqBfAVIbEPjYRUbi2J2mqd1onM1OVd2V3/ZcOKAU44kwQucqapcGxMrEBywQwUURvGewLfrvFJ8rySoa8kuMfhs7etRvqpA4KxdnddK9D8ptdYQecEVyjeueFqXD1kD+R86Vvt826zecJrYwdlLcfBYw== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?P1OssGyB1g7+3P+vGO2oot6Xwqvq?= =?utf-8?q?X5HoJrOpqRxCZkjX3FpyU0Rq9wlCPKVMDExCS2Wd0fvfReAbVxlRhATLqRJ885QZS?= =?utf-8?q?nBjM3ObrNj8ePiicGxRL367Dlq4EdH0DQM2Jmr2Z/zoKtNjIODCemHVfPbJ0I5Hk3?= =?utf-8?q?VN5up8D3GLFGdhLM10evz21hxFHffIP4T16zTmieEttfA7bCRa5lmPaiMtQVG3AmM?= =?utf-8?q?m2feU8vtnVJrXTH1cazLMqZPsbSs7esOxNpGGZ30JJ3AJoHakW5M2mT8AFqp1ihfu?= =?utf-8?q?XWhcK2sUbXlTXzbgkzScf5hJXhKBZkgTjYuIlvlwNS+3c04yqOM7osc9uyesD9QVZ?= =?utf-8?q?cvzbc1t8CqOLyAzi/mMvWEdFVO/47XRd9x1r3YNjIuBXgYBr5nyG/3FfB5kN4S+10?= =?utf-8?q?11mWJuFSaf2SynpYvCLMe09B2xQU78YxMEpmPYZzGiCbLBoX95YOEEFut+RAHikuC?= =?utf-8?q?8M1dW9nfQRSQ9vHsCA4CeRpsT39rnThac13vtswSkqaxL1CriG8OnzxKeEL11LAFM?= =?utf-8?q?SpVz04wSRQCGkZpxEH08vRMDDGmPEJUSiyBcOsuxs8zwJMfTHRhdejSRCQJtCjI7l?= =?utf-8?q?EPs/wsCkOVukKpGIj1EwTsABcTj8EQ45d5bkv+Yy9z2V8s15IfPZkFkg+hENiGL5m?= =?utf-8?q?vus7F5mK+5Oy0FgKEjXCTNSV7cyCiKIQauzg1g2gZz9NT6wp+BbLbvDq6UKmnDSfU?= =?utf-8?q?wI2RuJ/+tmUfImYgW9ofKjEeCo/HwMp7oC5Rj+Lcd5wt/scjgkGTzq7tWbMPuzveQ?= =?utf-8?q?Pbsdav6zMBKygbDlebDMX7pZvOCJeZ/W/NIMMhmYHcQXS0JpLwT32lBcBN3vdihwZ?= =?utf-8?q?RwcWp9Aw+TAAajxqQomcUcoajxuer7cBempmdzsDuYGM3eNIfJ4FZuWGxtBiwxKhr?= =?utf-8?q?QQSLIJQiIBcbdIBlL9zDD1UXoUXHRBNQZBYIJV5qq/sA=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: 08e77961-f5dc-4cd5-3d6b-08d9be91f124 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Dec 2021 23:40:27.4556 (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: DM8P223MB0303 Subject: [FFmpeg-devel] [PATCH v24 04/21] 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: XLvj164kiGSs 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 3fc4eeb63d..66b2082894 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: