From patchwork Fri Dec 10 21:37:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 32266 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2372505iog; Fri, 10 Dec 2021 13:37:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJwExMAVvX03cB6YcpYME6inBYDuZqezLh92uaUaYGpxGYUTlnJq2DX4q4R3pr0dgQxRHdLO X-Received: by 2002:a05:6402:34d:: with SMTP id r13mr41672129edw.208.1639172270336; Fri, 10 Dec 2021 13:37:50 -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 z21si8867810edd.365.2021.12.10.13.37.49; Fri, 10 Dec 2021 13:37:50 -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=klKmXwJK; 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 CDEFC68AF3B; Fri, 10 Dec 2021 23:37:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam08olkn2073.outbound.protection.outlook.com [40.92.46.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5925B68AF22 for ; Fri, 10 Dec 2021 23:37:18 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QLr0UsJOjen073oPksCDwbNMvgeUIxg4pDsFKlVhV6kIjcEVH6Sn0+4k7NGN8WMcoTW5ZdAX1zYBcar0QgOP4AGTJPfyccfHj4/NpY7AXJsTRUIoLvjrASs2uCyahPkR0W87t1riwylWDzyutji6MUts29yrvNSGrauzOTay/vzs2OJggjFNkJs6ryC0FdCH/ccxLbaDdkGG1x6UG+VWFMsknzRHeWnmpoiy7mxzqgZQFoVrK46gw54rFB8VQ7qpjWjjRF9aSSvLwspWZL9zMg7Esqa5yueaiPgW3JP9GMNUNtc0ao5Nq/JecUCqaHCq8aNPN7W/E+crANLVRRywHw== 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=S1b1H6KBqP/r5Uuxd4P2qkvcsFD3WNdthIiDaCQHIoy4RixIWbvTh9GJKs/rcqyLSyH9/iMoylviojpmCzJrYpxLMoViTct81tjyt1DKF7aI25bu+l6SaFd9Aw5OPTE9Q05nSwv6mrD8G0KVz9ydi7LkTSJ8KpxNmRNhUH/NCsFlz6nM3K168oL5h1ADnFQIU18mMR5UygMAH5HmMjjpweYCzFEJAsXhNbuZxvV4ukiEnA1r8xCeJSdRm5C9Ew2BpqWwGrVnkSsfdmPVLEoIIH1iUyYSeflxEDlVq3m4Wplw7cmL0PRbBEPNxPUfX2C/kLI80GRwpFQjXdntLCvQEQ== 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=klKmXwJKlGafnUfcuZo143PDGcRMGiJv/ZTrQMimcBSVYZfHoqGFMyl2JdQXsAE6zli4tsmpQu2eKG5pFAAFKt3Xqbjze3HU0/GPfTAVqs6ml0R/rVqmovsvMC2R//GqADEVBb/HE7VfHndPHXQlIskp845DMRV9h5nAJ+9sRhCQZkjv7kPJ357fkGvkQ9oeciCi8WrGILFvvKj/CdJ0xiTS7JTta6iE8XMdlBwcp63JNe93JWi+T5DUCSQydGGFGT9gdi4mtuHlh8njT6JdrHLOgZqubiz/afc58E+VgO3LpvlN13mvejMp8P/gya2DKyk5LXU/gmPbhzyVI986Cg== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0397.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.20; Fri, 10 Dec 2021 21:37:15 +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.015; Fri, 10 Dec 2021 21:37:15 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v23 04/21] avfilter/subtitles: Update vf_subtitles to use new decoding api Thread-Index: AQHX7g4ZrAdOWje2s0OY1e6pxX81hg== Date: Fri, 10 Dec 2021 21:37:15 +0000 Message-ID: References: <84c6ba3b99bf387e818d59f2161009ead8fb5767.1639172095.git.softworkz@hotmail.com> <0b41271ed30b530c1d55a9b824fc8bbbbd14fe5e.1639172095.git.softworkz@hotmail.com> In-Reply-To: <0b41271ed30b530c1d55a9b824fc8bbbbd14fe5e.1639172095.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: [8nFNf0/dl2H27ktYUgVvseLtbr51/YYH] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: adbdeb40-af44-433c-1748-08d9bc253c1f x-ms-traffictypediagnostic: DM8P223MB0397:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: /hZjJjRKmstmHmSfx9/T9smMZcA43rN8JxM07LLergn8NFCDJafOY3snPK1x9MLAgaWukimia4vkHwcz14XZGimjQFYatWq++2BfSrhNqqxlixSOqxSunrM/aRV8SE7nZXLBRb2rJSRI1JLcwowH+BKYg5DpKSf2x76Q/RrrS3SkcZNy8TaCH+QM1iywZ+hKTdYuTulw9L68bbju8n/VWcTTiM0vmed081LDrOVlKzq5Xe41jU1duRuX96mRirf71KpyHGpFxiipamXFGDtWx5dYKLivh30LSLwMzVx4cuz2UpleMw308lGhSsuVkd7eBltR92xTXgEi2nmEo9Ax1nrgS3hfz9VUYoY1IiCUPe0QbogMz/scfBOOHtucXg/UbHka0kko2qSQTelc2MwhvV/WTPP/wNeb2dVK7G2/UkHX7B8zIG7rp5iw/shrZ6jy+oJYGj7E4XLrFnXM9Q/Jq5BQY3GqeBXBQSD9yVJPHh9K5pkh/zsW9GbujXeqr4GATiwBGnpjMvc8ihWZP41bqgnqOvz13z6W8yNJXoL22raFS0A3np56jjO51/oKWh3HNQNcZ3/53jn1k2xjgusR3Q== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?L8bgQeOV9CoCk56Y3ZDAHEthI1sm?= =?utf-8?q?urd2OLimQjXyr5HkqcVmCNadH+QR+HQSCNUoxWsdn84zggaW5o5ZWZJAGCEODr2zl?= =?utf-8?q?O9FU68u4FFiEBJwOGLvUG6HuSvAyc/84jzt6YA6HGV5rt9KjGdt6Au//mz/0N32Qs?= =?utf-8?q?qBf6L/e8jXaWhM8MbnUZgRaEKSCrWzI8qHb6CZd+flr3CDC7kZIXcbrneFsRTYhe3?= =?utf-8?q?M231oa5CpyLbkNBhUIoNiwWkXPK2LfXrFKFdt4k1akcfXSLYGRsr24cTMGFFYYMdg?= =?utf-8?q?mPAFyHq+y4yolRFlXHpiBwRFeGeH7hbJ6gI40HsTaydKjdUzacpCfKVORAqF5Xmo/?= =?utf-8?q?TWgz3aeVg3TkaTejvpkYhLY6kCasw/wO/HeX2WrLddZPjkZe+Hg91gBfJbDvxet3N?= =?utf-8?q?w5VJZEAIIAC9jMHdgAcfgs9HGQIsx0rewDeQOvw2M/apeU9RIOpI22Il/rAx39GJ4?= =?utf-8?q?IliTAajovQfLhv0qljiqMOMgqD74hKczFsY62utUHarNO4lDhLzlPhAH13dYyP37K?= =?utf-8?q?ma6hVdi2AjBvxQ4C+ik6DLaFln89VlsKsZNCgwUy2EYrqeOeLgyVjHdgmyRW5U53Z?= =?utf-8?q?eopt7tMU9yMuFqxwZFQv7awoU4DO6M0GlvXCpfSKng4HLe8S7OH2cRL+cjfkfd/JL?= =?utf-8?q?7DlzqHL0sYm9xiJ2TPoyURttha2vNnzgj7AUZDPeyv0z2XJ7ql+1yaGF7GBfRjeUS?= =?utf-8?q?t+FMJ+YVNYOvp5Egb8pVOpN2PLK9d8ntuX5fgAJuK4mfD2s/rLZSp/28dr8h9np7x?= =?utf-8?q?sUhCDNOV5dcbeNbyH6ITxwoHHE9oaJWBfG9Y98squB3q8Rq5kfTc7kMlCKgW7alMB?= =?utf-8?q?7wRPSLZrjJqp1pEjEJhnCLWxY6AxrWGr8ml7vCnYMUSKVrlx895pauXcJQ5+GHPCj?= =?utf-8?q?IM/TJXT5ACuIoQi1/AGl4dF2xmUnUYyu/wheT+3Wkn2g=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: adbdeb40-af44-433c-1748-08d9bc253c1f X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Dec 2021 21:37:15.7520 (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: DM8P223MB0397 Subject: [FFmpeg-devel] [PATCH v23 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: Km2ruVw/BDI0 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: