From patchwork Thu Dec 9 12:12:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 32233 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp274524iog; Thu, 9 Dec 2021 04:13:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJwxm4d7iIDjc9hu/nUED6lgt/YBfxVg7kIwJCuXUgtpViYjLfasUQzIishymqf9Cdya4pDE X-Received: by 2002:a17:906:1599:: with SMTP id k25mr15187541ejd.298.1639052004999; Thu, 09 Dec 2021 04:13:24 -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 gb40si8797167ejc.602.2021.12.09.04.13.24; Thu, 09 Dec 2021 04:13:24 -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=THu1aAAc; 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 CD93868AF1F; Thu, 9 Dec 2021 14:12:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10olkn2096.outbound.protection.outlook.com [40.92.40.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A70D68AF1A for ; Thu, 9 Dec 2021 14:12:47 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VYzx1C4BNIoWbt40+MrcdQvIf4HCx6R8vx2KgN/6tMVh62k6T+MdIJLHr+4ktaI0egeu9O3f30mu3+BW6sxWrjqjV8TtpashVpK8DBRT4ApeN061mj5tZM1uCtGRnZJr2yrNrJDodee5lcgIkLeKLAiU25C+670vHsQ8fvSMqLmqI/DadtZJao3pPLJvQtSkhOwwfiInRI5DiF+UmJfKXgsa2VEgpogeB3QRKq3jyhEfKrWZv31Ouho/dEdEhAynEqkNueWFOhIG50elzu98vnSVqdBOQP0K099mbE0kIt80LOwEx8KPKkH7rOEZD9kd5eFgdw9sN5i3Urn+tNTGlQ== 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=RDcgdhI7xPhcH2bDYPN9QFbLg9grOmxEOAcl9uc9vQ81DkiMV5swXhz2qQhjcYGwinMgYf7FiUBaJJo0Wnks9SwpWSbS2KvBCg8/bxNZ9VDTcm9BBDWC2VxUrn5X2Dq2NvUyIlgnQRgL4y9Hw5v3MHgg7qWqXHE6aBGcR0jZ8cd4N2qVN4n8P2Xw7/GDOYkgb/YUNSAJ/6D0K/wc5bEqUI6UGVekYWkuPpDJrGKrR71D5cfKnYcRljOiQQivBnBBlpKWC/N+BAi5XAAxrVNX9riJaLnxAUZqbEtusGFNLwSEuOhDPALyvj7knnXPkHMVMQKK3t/bSOoyS81MVm2hWQ== 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=THu1aAAc1BVZwjMAbNgh8wyKyMNlfjB/oNjaDecAr7SRBw87f2liUAfAfyVQb6ZdkRUBGX4PGd7mZGUIPSrYyDIQPMlzlInYHoYXj6uXOV0OaYtgmwyVLcvdk0y2Ob43r2z2wRjV8JlkRlEcYxQqO/h0FYCvID4c+3A5foZa37uNLdzsui7fegpH3OOFwCNfIcnY8oNOyDehCIH+EIdj0EBxH5knVyhsOtOQs4ERQe0EgGLwZnOWvuZtRozlt1ufK0RctorEQUU0SuGK8sshlqIn/EhgQ/917L40obb/1dSATGb+ioj6FAfBck82qWaUrYK6u6ceGekWU4kvOiCIdw== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0399.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:8::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Thu, 9 Dec 2021 12:12:34 +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.025; Thu, 9 Dec 2021 12:12:34 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v22 04/23] avfilter/subtitles: Update vf_subtitles to use new decoding api Thread-Index: AQHX7PYMefMLQlKSt0mjLLoW4wBW6Q== Date: Thu, 9 Dec 2021 12:12:34 +0000 Message-ID: References: <05fff8a8e41014ff699b57bd805f0411865328af.1639051681.git.softworkz@hotmail.com> In-Reply-To: <05fff8a8e41014ff699b57bd805f0411865328af.1639051681.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: [z02FiZMhiaDXwWNBE6Nna477bYI9Wesw] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6c656153-cad7-4211-2843-08d9bb0d2f03 x-ms-traffictypediagnostic: DM8P223MB0399:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: wRt1P2PDJhfhiEANFIOtv+nyGuyVQcVftMHbp3CfGyva9YLlHknKLcFY1+i2+0ZQf6gb4UQBtRX9gvcpka+L6XIZZj+rzwgfriEYMdYAPJs274XKi7NnsV89UQcdmlDi0h9aZ24nERqaZ/AR+GFSHodn2lUdji4j/ZbtAARh6oGwOSn2vpPbB5jwBNrdlPt4ozpQiQV7dXbSvnu9GSktFi8cpIAUPaEtQH8D9IAZJ+UUsfBOfdj9Bn1aP01Ai1qTqQUAT0EVO984u4wcXs7sUCg30IqvZ1Qr/d7EGAkOBv7BCG3zz960QvCJyXV/lk+btFBzqHznVdTg++g6Z9N/TSkBnsWdf1oB2b79igTgwqvkSUorO+H6zeUwaSISKaLXguCUxYXbLo5Iw07P88BxjGttEksmYYzFozpeV9+tHO+v/WCwTvA4tyOIl4K54BHImTd4pN2pN1GwmRP+nPSk07dV92+M1yvKU4j4e3KSEJerkhT0dQllngDeyQdNiZgO2RWLX8N+/kIRrKcJt1BJyJiQqS0ZNKmv2WFHEGp7clFWmdAsZQGSVGQasbYWZSakgBjurXnCJFDzW74Ltmu7Xg== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?gsy3SULKtj1vrVHEx5AmGrwPQ+CH?= =?utf-8?q?FUSLuMIheOicoCSV7M1/BLfVYhDQpKKnJPiG7dE5N+uB0wKulol8PUjqaV9qpmCut?= =?utf-8?q?E/EKN2Z9y7FY74//MjQtb0gMihyzO4/xa7+++vhsg9eQ/4u9JYKu801pvWAX5Ei0z?= =?utf-8?q?Ay4692tJGdzcGLdynnso8/jGnoWdYb+YWgbRfI5ebrol/AJjp2wCmorj99RzsXq+c?= =?utf-8?q?eymnjvkTDKGtOhVtOHCFxiwNmAgKk1f8T5kUdOaYek5z62xu0dd1z22LuDbHT2/G8?= =?utf-8?q?gV8hNkzOhvCS0QKt85TyjWBrmv+DuTHeQxGfcOVpivhVuZiuueMnUUqum64l0UUrs?= =?utf-8?q?wDvHTmqpi3OFf1Z0W1p9iUHXDCvr+3I5FSHU6+TDMTNwCcvBxE5LoMkmo7BwH8N8c?= =?utf-8?q?GF4hF4n5wi4MqAtvCv/D6gdzv20rSt3dAHIPy3uULWtiRu7GBmYPXh8junM68nysz?= =?utf-8?q?c0eQh6Hz4EXKKOVpY1I5IrpQ0RoU96V8zjO+9WLOwuum4gJ8px2HkUENuqeQUEWHW?= =?utf-8?q?QJcJyKmTDVIghsC/CCDmnP1KQO4twDfK5RyUkEyFcgWZaRH8/BiiojZv/EzfP9XRx?= =?utf-8?q?jWoRO/SNpofHPVTBrnaKysXkkWupKKXqDVV4uKX3kTtJoyq8BTzsA3MolQRdRT7r/?= =?utf-8?q?yHbjNz8IG6eD9sE91FCcjV6B5FHY7GqjeQhsMGA8YXHYSD3P7avvVVSzzDSg5o07y?= =?utf-8?q?66uSJ+/gGEjMGgmSViS5iE++91jHKwy5k0rdv+2DCOOszt7qPsi7RYdKaniBXRGEK?= =?utf-8?q?F503gsj8xCVr2nu9F8G/JeHI9UctgkJTY+yonQlebC4yBkfhsVPcezdZLVboJT6g6?= =?utf-8?q?jJykLbKWQRUcYDSZw9fOYY28Sd4ucTqDDr1cRTgxK7Lg8K+BKNrAyxFP8buZxlUjH?= =?utf-8?q?Iym4M2QCkneCuNnwL+no9dE+W30O3d8EDr9W7gacKwHQ=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: 6c656153-cad7-4211-2843-08d9bb0d2f03 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Dec 2021 12:12:34.6235 (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: DM8P223MB0399 Subject: [FFmpeg-devel] [PATCH v22 04/23] 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: cboV43XEKrK1 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: