From patchwork Sat Nov 27 19:37:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31770 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp4019267iob; Sat, 27 Nov 2021 11:39:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJziKZX4xnHDkJHUuB8TjQeFgIy97oYj+lI5jdJWQf318b37HGjqon/XsG9/gYO4rO6Q7Ljb X-Received: by 2002:a17:906:3c46:: with SMTP id i6mr45634369ejg.371.1638041952433; Sat, 27 Nov 2021 11:39:12 -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 cm20si15178061edb.527.2021.11.27.11.39.12; Sat, 27 Nov 2021 11:39:12 -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=QlcO4CzN; 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 B0C4E68AC7F; Sat, 27 Nov 2021 21:38:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11olkn2050.outbound.protection.outlook.com [40.92.20.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B2B168AC54 for ; Sat, 27 Nov 2021 21:37:56 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nEBD2V2cKWTdTbPd6gYC2YG8zbVF3QePGIfU7UPc3QkweS9ziUfV9PQqLaUK+O8SIz5bp1JxdkT4s2VPY8zsOh5DW2DOHhsTltTsIOTg5qTXXpvJMeZkrK0bso6Os0KIWf28CzzN5Va82dAK4PJ4qoKLqt1MMcJbXKLihGre6fgtKtpW8sATaPEHC7oSjVT3tzuvXYH1luAWbSY/4rjOew0YS/JfczyOrGq2IGMo+40ist7JVZgduq15m1K3TJZx8Phpmb5SoHSR5vsf6Mwk7nmutOD0lP/UndQreaZ23l68vz1qP7b4QphbjxTo2d6XR8+y4soDe+u/Ftk5IwEZhQ== 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=BPJ009Lg4khKXLz34uXBPEiXMJTO4cnuJvp3ZMq2XyBohmDNLpgC9d/O6EKgBQ5qN1WqWOmKpicz6k8io+J3buzPwtpddblN0AJ9XjA7gXNEDLboxKojiiIjA3ew3+0eC/fa04z6Y8v2Fjh8S0JPt8QaotGpr3Po4hZeNy79ijsw7xsq+3qBkTSbR8GwQiD1O++ohjwUR/AtXHsj8x+JqzEuCMgGI3DQfu39rL3eQWKxd74+F9wxBrMfQtzHFkGYrsvTCg2NEIHBQ9sHXQpCwvyG+QkimB64ySuEnYs4LYAbk0SvRszNsYeTf7tPa/jZfBAzcqTWgl9w4gExx6Y7Lw== 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=QlcO4CzNxQguiA+LzZict6wNTQ6Busyf0PQhtxFlxuWhWr/GeAbNl5k6KSqmAsBAmJ4IqCTWp2zNj3mKuGDIAGph2jP6RYrGAU6dD6Uic0eCWkPtWRFe3G1NciuCKJnMdIJM27MJT1NplyWPYL7UV9PDrwwqXPw/eze6Y3D2UAQMq/yhKGwqhvFM84U488olxlkDsk3dDgJGf8gBiShML9klRshOgtb6aFU60e+CbU6tct0YQ4rt23we3QYU1+Mslrh1h791IYzZTerEmyEnlRj2OcaCiJoKAwyUOK6NJBK1azHkZvHIpjR+mLjnMM6DmaSRo3FTy8zR4PLVfq6Y8g== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0398.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:5::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Sat, 27 Nov 2021 19:37:45 +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.022; Sat, 27 Nov 2021 19:37:45 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v17 04/19] avfilter/subtitles: Update vf_subtitles to use new decoding api Thread-Index: AQHX48ZA3r0EW2dF9Umd/sGpob/c6A== Date: Sat, 27 Nov 2021 19:37:44 +0000 Message-ID: References: <7463f4e16ad074b56143d86846344e23a3594ef3.1638041335.git.softworkz@hotmail.com> <2931036119e295dd393764444287c4dd80d423f8.1638041335.git.softworkz@hotmail.com> In-Reply-To: <2931036119e295dd393764444287c4dd80d423f8.1638041335.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: [/Gz70vjtrXs23x3Xcss+j6DlB/Whc9sb] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3e4315a2-f7ee-4181-7984-08d9b1dd629d x-ms-traffictypediagnostic: DM8P223MB0398: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: H0AXQCqLXU1vP+lkebodPtZDYNnMX4b4jsny4lZObFa7TL9IGNzovtZjl7czm0k6U/uFRC0cFl5XVn7W7JVFW06sPpzgV8AdDGTIXnG3YgEaReRgFURTnxlkXcchuqcBxil0ED+tXevLSRjpO/LsxiAxAJiEAY3lx7lMzUSJ6q4AASO0Mcuz/AkCNJwqpKfci7DemdF5aLPuQegKNY0Z8V804wLMVrFLPG3jdbIi4yVYwVRiik2DwBho5ekM8tw2ZFQhzsq+8jfjs4BuyRMMGrZOh65b36Zb+kZnZpKTDBihJAx6QiLy1GsKjBbrA0g1eCXcMmElx2GAv6fvnlAkjkIp70lb2J2RS35E44i9hTV+4CtwVZy3TKK55AGAw3yMhLIevsEXHwdpKpU802BGIcET+ScP+ptRn8Lsok1Lctf8wxtn+TB3YzLLN2nOGX1z/32caBpUCcZRkO1K9hqqCeLDVGT7E4J6iRb3cMgDPQvhSmhxmrCJPSouFrAn8sEejSVhMCJcjjIPxzVwKuyoSxEmFzC7r6UdxtqlR4JeB8ZG448pekkKrd4329PjBTxXmvfgCH/GEfz1lAPLc/qluw== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: e72rrMipf/vs7WF9t1D8rxxGFmYwtb+GLaFCu6JRzsxegf+doHp1U0Gw/pry7oTcqly1eHhmwSGr6osLX63v5JgI3ODVrIL5dGuG04mhQsmkXC5urut3xv1ZGt0e6FeNdZ80LJTTKJV4DpaalF6l/r5Wqb49ZTMmbE+EZ+vw4Gkb8rs+2r/UI8ZTGzGr+0ZdcQZOeh83VAodv77mYKiIhI6Rq+4jdFXCNa0tXgCq9CWXDPhWe5OJ3PrylQFagr/B/BhRDsOF21ge95M9OubtbYeCwzvjIJFTqEP3o4mOrrw+2VCyUzycHKgEcS1ewA6rRLD5aPx0mq/slWCIWLTjdW0vtMxqYIvUM8KWn9IPvMy19GXgLMa56uHnrH9/xLuMx68jbjrOH4y7LDvLwKMDcdskNiMaKslRFTSuM3ikTW9DsirS9txnQpdVbHwiP/opb8ZFMPmgHMotVeZ906sOGDODoLyrbeQvs426RPZS+JkZ69bPLTEvaOr+tGbdSDioemNnAQ1NnpNNwovIgOtPJ/4UFhEjsHt6SUILRet+03x5oEM8aHPrBo8m8tay0ateAs5AB/CLy6zlBfNleanRf8SeN88OmryqkwGWVJiMjdhIV11Ib9l9GvkmhgfyYY+GAhkzMoH6DmqK3ccWVRAv75nAjD2cT9o2WTW3pUH/+ow0s9SDeS0DIlpC0vsvY40kGLH/LFZMJC99Wj/VC1ObMA== 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: 3e4315a2-f7ee-4181-7984-08d9b1dd629d X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Nov 2021 19:37:44.8906 (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: DM8P223MB0398 Subject: [FFmpeg-devel] [PATCH v17 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: xG8LTQpQ48do 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: