From patchwork Sun Dec 5 19:41:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 32026 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3628465iog; Sun, 5 Dec 2021 11:43:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJw0PuopU++Ma8TVjxs6CGObpswRBmpimTLtIcj1a3xWEAY4K1rLR7iIsQ3i0JKJG2+7BE98 X-Received: by 2002:a05:6402:1a4f:: with SMTP id bf15mr48089738edb.260.1638733381249; Sun, 05 Dec 2021 11:43:01 -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 u19si15037822edo.386.2021.12.05.11.43.00; Sun, 05 Dec 2021 11:43:01 -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=LgqM+TnP; 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 CF9FC68AF42; Sun, 5 Dec 2021 21:41:52 +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-dm6nam10olkn2093.outbound.protection.outlook.com [40.92.41.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F02468AEEC for ; Sun, 5 Dec 2021 21:41:46 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DD20Jv9uOgZsxcaAgFO3dk5Goy+ezWOVw9HC3SKCGaW2enTrJnAQuFPoipMx1X3vDmQLnup5YEQ4jNkLkPW01Qj239NV8fgW57Gs9vlg0DPbKGzjp2HDpwbbA3xcIv5OTUxNpCfQ4+8mDewTaDGwZj2B8X3gL9XXnMt7HLfSqFcOHCpuEhCXJDloEJWytfP2VWQoF8lt6EWo9dRL1IIHWPcaMpTSUIdhUjhxdQyqvglakNUmOQsANiSQonOLVh7sY7BnxPhPFy++kiSiShLOxDOZaoTcudGICa9BPIig906SyXCJEOXOKIpzHr7LKsqyKaFCkmEWWlJ30Z/WOcjkSg== 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=MRY/E5+NIlzJScNIyQUozlVnJtCJhDhtHCVpijJk8uM=; b=izvRifkSs6zB94IGmalnJ8tq0Ve0Hk3EGVgHjEk3jSkQ/wvB1ubQjmKY6fwQFjTzG0sP08csc81CCVmcTAp8EKV5M4zHagLKyc0pE0ZC1fs6MyG5+eMfU1LsOnW0lgmw69wnuO2ipmIrroPvPzoLbd6XAdjgEBHSC2Rb3ANsz6o9VvZEJxUkRu255iYuhyIrQHD8WRKvrE98NmKSLqPiDjbGHhh9GlRvb69c4/2G868VRq5zFG7O6MWgDnnpm90Mpsf1iMaH6qXkFWZkm10Wa8NtXT9O2verxfd9ltjmYNjWIsF3dFltRRqZoAz0EjF7WXN9k8GXHFqV1k3ZQ02mKw== 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=MRY/E5+NIlzJScNIyQUozlVnJtCJhDhtHCVpijJk8uM=; b=LgqM+TnPXlrSdbEmx/P8Wk8Xqx+GUZT6hDkQljlI6VeEs1qs+ZCss7YtlS5ug150k8PnzRziJdcEzegMxZQDgQLjEk0IkiFuGfiM/exT4VgIvzQce5VjfA7gJbJIh4ZRylrLB8OJ67KJjkkF6VYgLwsjCO5ILwhgMYYfy2HLmGIj9sGtpYnQ+Nd2PXOKgbodJhwONpNAKuIzkhBM2RFcVX31Y3kpe1aPU69uZJdE26bG8hlQJRuVMJYL4oEjvt0GJP6rwAzOHVTnOziQswBlG3fuS9qHYNGLiCGiIcETtDZRf6oFiOG6yAYtEjvHn1OBcmlDsGwWqmj6W16g3NjZ9w== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0320.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8::20) 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:43 +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:43 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v21 09/20] avfilter/subtitles: Add subtitles.c for subtitle frame allocation Thread-Index: AQHX6hAhN/tmtEKCakONYaJ7bxxs5A== Date: Sun, 5 Dec 2021 19:41:43 +0000 Message-ID: References: <1bdaf4de8cf369e4a28e7a5d8be2870ea5e34b39.1638733198.git.softworkz@hotmail.com> <9fdc2f3e9bedd2ade341e81095496866d786488b.1638733198.git.softworkz@hotmail.com> <9189c7c58671e4d611b5a7f44c9db4b37416088c.1638733198.git.softworkz@hotmail.com> <3ce4c329dfd8718fb86f61ee73b044f1a3285486.1638733198.git.softworkz@hotmail.com> <8e26ae0f796a7c9be3aa94740b68a7fa9400dafc.1638733198.git.softworkz@hotmail.com> <7cd2de4f62b2e30ce670cfe421afa1171ad23594.1638733198.git.softworkz@hotmail.com> <602d3c490440d703afd815714e183e62367e3e3e.1638733198.git.softworkz@hotmail.com> In-Reply-To: <602d3c490440d703afd815714e183e62367e3e3e.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: [rouR1G14LwgAUCMAv0chtRmQCLYYlEMXKlHe0AUTcwRaj8/pDfx2tVyO73AZ3u3W] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 4eac66ec-fcd4-47fb-b62f-08d9b8274434 x-ms-traffictypediagnostic: DM8P223MB0320: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: yYp9PKaj03Skv+y5EQ+wIkiIoJLr5K368yGOJrQQr0DWLTgLZ+TLj8wpjrTuks6yhqOqpV65oJoSwGM5u84LhtZT3VPBtwUoSReLct2Sz8HL+aldmYs2d255PXx0x05NnpYtCWXA7ZAJ2sYFDdb4Dxl/N8l0+t4jY4htOfgcjvBVuUkp+qqbGnEfud1h/gcBH/qNPtLLiuIqUG1VBLRhjZZomrEdy5gkJjqoIKd3YKJHjOtOwcJE0cM7fxLzTnhiPjrHIl7o6cQ5y2S6FMUt/x9zrLgIHNsZMBWxy9qV/1qSTfeSG+vxqDo+AZqxBGYKLKEfE70v16Lq8+Nh1pL0E5d8HUvfTSRYycPUp+tc7qxzlVHKOyTsx3xN7lO6wFhoWcCOdc9iDxyCPsKHT3WPSjrp3ZiLqL1mcZB8G0Cu/4KvoYmTsZtUx2OtOt5BBR4oP0Xxh0r6qE2ZIHdRfpCUVMerWO7rPMCiCeAY3wkcfoF61q0ctaTE8g60EfHaT6ffsjwkKUhS7FQWAB8ae7oozi3g6HcGaWk97O14PLj2dekh1dAib2ka0Y2iG/cFh06ep6l5FgIBAKz0fomEX+Kpsw== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?9SSEzl/0fEzUmfAu3DUs2GT+03wR?= =?utf-8?q?MNHeOQBUB7h87grJ9smf18BWe2p7Du6H1I7R5fa8rD4w7SOU/L7aPpE3us7rsppk+?= =?utf-8?q?lt1RpWqTB6rhAt4+ztE+NKXPcg28ZHYguZzz1ag/6EU/igFGwRRgBEa3yP7yxY0W0?= =?utf-8?q?ICdLdw0LrZCE8u1HGANaIn4novzRn8j53hX1rnUqXKU/Q9vkLH634Zw/9TYxVn/f5?= =?utf-8?q?DVQ01pSbutp7xvjvi2QP/ohyNzy9ADvtJ0skysffoWL96EGOJuiZQNujwuZCuWM4b?= =?utf-8?q?lnLWhlsQt30OG9DR4tqIYbgGzs+2OpJar/FdQvQpTvFx1jQ0T/t32hoQEYH4ZetoE?= =?utf-8?q?xyda56ck18amEcb4FAp0dhEYU0ridAeZga7CFMfI0TLyuZRODBozr8RxP/nf8PdNY?= =?utf-8?q?AneAjTT2eRV8fJVZe/PvBCpP/OvS6Y5nbSoVV3L2UBxZ210BJaVdgRr2gjv4krAlH?= =?utf-8?q?1AYENqdxJwZZQZuYflCuOkdealCdQGHtJwdLvnRd2ODZea4vcJ93SCXqGJaqBfhVN?= =?utf-8?q?XpY9uLszrWjmn+TXGx4F05cmyMu4hmJW1i/smUjQuVq67w2Z5nwtH/0XXoXLsy+Gu?= =?utf-8?q?HPGj2PwQYGRfvoE8KgA96I/Rn+m99gltlhLYqH1CbRXzEschotfrNKke0ccHz7tS3?= =?utf-8?q?6bWuQHbwMHrk7FaVQ+SBMePYvdj2m+Z4ZmRmWH/t7okZsO0n2TtMgVAgpWLs0BHwH?= =?utf-8?q?Ei6i0CYu2u6ZC902Ter/avnvEQiJNQEXVVJM2LHFL7ePUoip2NihsHK6HUL6bcEX+?= =?utf-8?q?Qgcfzrt6crr6HlY2d2Ru6OPGy+QvU2mEvqFCZeImAfurSUy6boZb5uDUmQtOalg9V?= =?utf-8?q?hV+hgtMn4xwJovKMdgdBf6NQZQK0p61Oe47nOZ5NCZw8SEV6S1m292HSTdsCy9W/m?= =?utf-8?q?NcXVN4YeaBmmCipvjga1Y2HyTUV3gBFt8LHRQQ5b+Rya294/b+Z5kaA/MF0SlpHno?= =?utf-8?q?7Btp7pAXaxEa19ZDXRqn0sfA7eusDdEvf9EmPS0eyJQ=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: 4eac66ec-fcd4-47fb-b62f-08d9b8274434 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Dec 2021 19:41:43.6569 (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: DM8P223MB0320 Subject: [FFmpeg-devel] [PATCH v21 09/20] avfilter/subtitles: Add subtitles.c for subtitle frame allocation 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: fHSsmWNnWdLi Analog to avfilter/video.c and avfilter/audio.c Signed-off-by: softworkz --- libavfilter/Makefile | 1 + libavfilter/avfilter.c | 4 +++ libavfilter/internal.h | 1 + libavfilter/subtitles.c | 63 +++++++++++++++++++++++++++++++++++++++++ libavfilter/subtitles.h | 44 ++++++++++++++++++++++++++++ 5 files changed, 113 insertions(+) create mode 100644 libavfilter/subtitles.c create mode 100644 libavfilter/subtitles.h diff --git a/libavfilter/Makefile b/libavfilter/Makefile index c8082c4a2f..664566a18a 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -19,6 +19,7 @@ OBJS = allfilters.o \ framequeue.o \ graphdump.o \ graphparser.o \ + subtitles.o \ video.o \ OBJS-$(HAVE_THREADS) += pthread.o diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 7362bcdab5..df5b8f483c 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -43,6 +43,7 @@ #include "formats.h" #include "framepool.h" #include "internal.h" +#include "subtitles.h" #include "libavutil/ffversion.h" const char av_filter_ffversion[] = "FFmpeg version " FFMPEG_VERSION; @@ -1475,6 +1476,9 @@ int ff_inlink_make_frame_writable(AVFilterLink *link, AVFrame **rframe) case AVMEDIA_TYPE_AUDIO: out = ff_get_audio_buffer(link, frame->nb_samples); break; + case AVMEDIA_TYPE_SUBTITLE: + out = ff_get_subtitles_buffer(link, link->format); + break; default: return AVERROR(EINVAL); } diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 1099b82b4b..fc09ef574c 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -90,6 +90,7 @@ struct AVFilterPad { union { AVFrame *(*video)(AVFilterLink *link, int w, int h); AVFrame *(*audio)(AVFilterLink *link, int nb_samples); + AVFrame *(*subtitle)(AVFilterLink *link, int format); } get_buffer; /** diff --git a/libavfilter/subtitles.c b/libavfilter/subtitles.c new file mode 100644 index 0000000000..951bfd612c --- /dev/null +++ b/libavfilter/subtitles.c @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2021 softworkz + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/common.h" + +#include "subtitles.h" +#include "avfilter.h" +#include "internal.h" + + +AVFrame *ff_null_get_subtitles_buffer(AVFilterLink *link, int format) +{ + return ff_get_subtitles_buffer(link->dst->outputs[0], format); +} + +AVFrame *ff_default_get_subtitles_buffer(AVFilterLink *link, int format) +{ + AVFrame *frame; + + frame = av_frame_alloc(); + if (!frame) + return NULL; + + frame->format = format; + frame->type = AVMEDIA_TYPE_SUBTITLE; + + if (av_frame_get_buffer2(frame, 0) < 0) { + av_frame_free(&frame); + return NULL; + } + + return frame; +} + +AVFrame *ff_get_subtitles_buffer(AVFilterLink *link, int format) +{ + AVFrame *ret = NULL; + + if (link->dstpad->get_buffer.subtitle) + ret = link->dstpad->get_buffer.subtitle(link, format); + + if (!ret) + ret = ff_default_get_subtitles_buffer(link, format); + + return ret; +} diff --git a/libavfilter/subtitles.h b/libavfilter/subtitles.h new file mode 100644 index 0000000000..4a9115126e --- /dev/null +++ b/libavfilter/subtitles.h @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2021 softworkz + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVFILTER_SUBTITLES_H +#define AVFILTER_SUBTITLES_H + +#include "avfilter.h" +#include "internal.h" + +/** default handler for get_subtitles_buffer() for subtitle inputs */ +AVFrame *ff_default_get_subtitles_buffer(AVFilterLink *link, int format); + +/** get_subtitles_buffer() handler for filters which simply pass subtitles along */ +AVFrame *ff_null_get_subtitles_buffer(AVFilterLink *link, int format); + +/** + * Request a subtitles frame with a specific set of permissions. + * + * @param link the output link to the filter from which the buffer will + * be requested + * @param format The subtitles format. + * @return A reference to the frame. This must be unreferenced with + * av_frame_free when you are finished with it. +*/ +AVFrame *ff_get_subtitles_buffer(AVFilterLink *link, int format); + +#endif /* AVFILTER_SUBTITLES_H */