From patchwork Mon Dec 13 23:40:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 32462 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp6140458iog; Mon, 13 Dec 2021 15:42:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJyZiljgLN0sSTQbKq0d2mmVI3xe7k2qgPf1pLpdN6BePq3Yg+17Z8UQ5EnANMxEImyBbpXU X-Received: by 2002:a17:907:6ea6:: with SMTP id sh38mr1607330ejc.585.1639438949635; Mon, 13 Dec 2021 15:42:29 -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 n11si17111338edo.578.2021.12.13.15.42.28; Mon, 13 Dec 2021 15:42:29 -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=PlVP8j9z; 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 99ECC68B0C3; Tue, 14 Dec 2021 01:40:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12olkn2082.outbound.protection.outlook.com [40.92.21.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CDA9668B0A0 for ; Tue, 14 Dec 2021 01:40:41 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wt2qkPYE/ZjfMOMxjZgj+WNNV6MW8J6YcgPWh9w2c4AlhtoMHrmmj7w6RWuiDpt932sSs89/t5JgSHXAKU8L+7rpMRH8wnA3u4xD2BBy58OZXvu7NP19QmSH4Dlkr0u553F107+45+aSv3qF8uLl+lf8SDneR3XifYvvCj9+fde4L4uu9lQhHbUjcmsDvTaeWQV8MtC3Ef4eOlyBVloPohnx60ONfmF2G4Iv7iTI8LwmNSMke5utRvgUdg8HvxbyGkzPyu54WPAdcSPq+7s2fkzhQVpuv7a32HwkX48snWILhzFVzKIy/fZlxGGnplh2g6ZqxSxB2tqY7D+mXH0o9A== 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=jSi6/fKTW8CrEj1Ui4nO859/uABVA3v6MpWqEtcs02w=; b=GZZfK1X/VaKm/TVYN674CTQZb/NHKEIqt4GNLRYexqfqLbBtenHVF2GiIBfa045RSus0Q3oJimWiVBCdfuJfUsGanDWSr6/aKDWiQRpDjvhOMz773rnHpxtnaZcT54KrLkteVn0vWsaLTQqrPbJ3/6MRXAPy9zsEksN1EB9ZH9aTVJyNq8xs//kyaD19oBgIK/Hx5sQ8SVpxDwqJrpRdN31gKR2z4eZzwXdDKzeTNgfYtny95783rpA3jOpOPTm7Ba8kvkwKe6sXWpugYfS/ZMzij0UowFaIgAWex8fqFJqEJVyI+dZj6U71ZbnCk9pGe98/IDmPNlF7GLqtPQyv9Q== 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=jSi6/fKTW8CrEj1Ui4nO859/uABVA3v6MpWqEtcs02w=; b=PlVP8j9z3KlLjwMj4n05KDbBpBdio4XLTX2kxfN8ewm9SAhnmYyhSamugD65b01LXlMFWVGh74uO3USW40Bpk33X4PSmhPzDuWgn5hr/tXw9JOUDV6Xp/TzxUqBRqQsCWC+MaQctIXmoVwn19NyutQ7yuOpmX1W9tJFndpdCqJyAIPAcEYKHwN+uyFfs2mHJ/MlfL5WzKmmtrrEW9dyJ+YvARcqEsqSiL+w2dp6eO2fvTZ/B5dOCK4b3B3vT9rCLGpq0kYRF32kszzqqeWkmVGEtoCvEI1CcMegDj3oYz65cumqUT5G3RiyC6MhnQ9ScoBHwy0JbGLeKB6qyJN5Ecg== 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.4778.17; Mon, 13 Dec 2021 23:40:40 +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:40 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v24 11/21] avfilter/sbuffer: Add sbuffersrc and sbuffersink filters Thread-Index: AQHX8HrWhPOpQCPNJ0u1YaSsiS956A== Date: Mon, 13 Dec 2021 23:40:40 +0000 Message-ID: References: <1ef42eb01b3627bbad539abd46206f320bb39697.1639438462.git.softworkz@hotmail.com> <4148d77a82d4b7e229fc81ce9bc1bc06904533f1.1639438462.git.softworkz@hotmail.com> <2ac798924ee984010d2e85f00bc992d9aa106171.1639438462.git.softworkz@hotmail.com> <300ea7188b331ca5e00dd7e04c03df8aba2a99c0.1639438462.git.softworkz@hotmail.com> <9474726b26f0d3e8f353d07caed2fbd33cdf473a.1639438462.git.softworkz@hotmail.com> <424522c96b5cdf6b03faa6bdceb1d25449463429.1639438462.git.softworkz@hotmail.com> <90caff245055005e6a4a890b3665da55aa853b31.1639438462.git.softworkz@hotmail.com> In-Reply-To: <90caff245055005e6a4a890b3665da55aa853b31.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: [09JMtovXBLUZVVgl9M7xSQP20uJ7XWId] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 331787c7-1fd6-47f5-33f7-08d9be91f92a x-ms-traffictypediagnostic: DM8P223MB0397:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 0g/nQ6t5KxSSeNOkfK9iI49ImRaen/hwpsIZyS8m40g+wipgE4/ISjcPgmNhw6c6gTxtO/4YPYS2gPKCsYbvEUrqVfiMzac58mGETc21OG+Nk3tWUQ4ZT5nqvi5qE+2+bdu2E0cttL5yLYClCPG+TBA/wuNnCTPtja/HBgRM3RADNdqJ9vvFxay1fcMp2LSbhOSHvf53CTdTTqCL1j2XbKINNUZF5jFUB1Yw99MqLen8vSmz6NMUIWz5DM97Yd+07SreUiEFrtlQPgrf3yEDsv6SwfeX11NSEx8oYtg31LdYBzVQxK/ZNqpbHSSxOHok/JfIuJeNv7aAE3kNTLY43DObrtZz3m5qOMVlvDXRJ2CrPxpgOo5aCBGEd8810DaIUudD5HaNFE4GYzGTfII44ovevzuqwvt1PxmInk2RHPBcaZsi+pQhbEbmb22HSzgCVGDjbqlnp5+5g6s9KltuPdqngNPtTCQk/uKGziF0PMgdP6rGkXn6+8Q9qg9r7w3WEHJ3Z+WPNxQ8peKyRmpbVR5EPZxVTcTTpNaIQ5Pu4e3g3b/KbbKXo8QFmi+zS38fRFFfkJ1oidor6QOlSl3h0w== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?s86XJC7wojdn+OtTfwJrT+xjSQ2G?= =?utf-8?q?FrqwX6Jnp9z9kdAoP89xl8btqqISz/7gyDNIH+Z+WlaZYz7sT+bAUOWakV3X8CSgo?= =?utf-8?q?p+dJYtPmao0byccx3xMIAL5c2qUNVRx1lo9M2nwxVNnhNVTJMs2/Gk/+22G7HyVQ0?= =?utf-8?q?gOL8YEAPLF7G36XmGsjYxSUC2YhycDKZTmsyB1YidyEevSm/Srm3TZJZrZ7iMuy08?= =?utf-8?q?MrhKmANCzDVkcBmAvtGyFW4KmNw5CsBbJYMVbCpE/L/wJal+iGAOKeCtKeUrKa9L3?= =?utf-8?q?S/94n233wFe6PGo3Fecpkf7NgsjlLu2bio51+cAUHZpcrpUsYeLP3uOgSDBjlgv/8?= =?utf-8?q?1BR7e+9VU7UTI4qBOWEnz180fJVzl8xSudb7JMZgHwiFv5IndDzfj/r6J4Z/S8AZS?= =?utf-8?q?ilfh7cVPFsWqPSWcZvaLN7Ke4Yhppdwismyc4/aPcA5SNAlQB2D9MHLeuT9vVfMdN?= =?utf-8?q?iNSFzyOu1S0y4c1uO3gSZmLKOjPJrwzPvSzjYJDsHBG6M5TuGMXkebfzCrxBRVNY3?= =?utf-8?q?xQbXVr5+zFwbOhnoSKS8geozSH/EBZV0ctFdbDxnpLOKVMFmBG2c/DW08oLuYmPc8?= =?utf-8?q?HtnGa1Bbs8lJVpcVQ5BeiaEe2bq4RzCjJSPVeNiQjc6aa1CmFbJxUHTIe2cXJYg5N?= =?utf-8?q?I6fpJq5DJLsJO3p5jLT496mJ/qhbaSVOSPfSgWWpweNSF5gqv+0hcPlrdO2fYhcUx?= =?utf-8?q?z+hSNvZno0X0D/neCLokCbzQveJpaoWqOVhmK0H2KOe7CP+zPfwuL8sZjexpLHde6?= =?utf-8?q?OLjMSPe3EzTBc7YrR6BR0ZTd9KocLVTt5uG1x9l8f3NLg81EpP4Sime7uIGlzgRHJ?= =?utf-8?q?rD7EiQXl5TrURFbwzhuxWvERqowLw9xZ8DaYF8W7UL2jQ02iPPxSWE8msQiMLxYav?= =?utf-8?q?F50iQP3hEII2u4oCEOwYk7JiPVPvwILhlUUlJ4P8CQIw=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: 331787c7-1fd6-47f5-33f7-08d9be91f92a X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Dec 2021 23:40:40.8826 (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 v24 11/21] avfilter/sbuffer: Add sbuffersrc and sbuffersink filters 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: ZQHyo9aSBm4j Signed-off-by: softworkz --- configure | 2 +- libavfilter/allfilters.c | 2 ++ libavfilter/buffersink.c | 54 ++++++++++++++++++++++++++++++ libavfilter/buffersink.h | 7 ++++ libavfilter/buffersrc.c | 72 ++++++++++++++++++++++++++++++++++++++++ libavfilter/buffersrc.h | 1 + 6 files changed, 137 insertions(+), 1 deletion(-) diff --git a/configure b/configure index a7593ec2db..0d0310cc9d 100755 --- a/configure +++ b/configure @@ -7809,7 +7809,7 @@ print_enabled_components(){ fi done if [ "$name" = "filter_list" ]; then - for c in asrc_abuffer vsrc_buffer asink_abuffer vsink_buffer; do + for c in asrc_abuffer vsrc_buffer ssrc_sbuffer asink_abuffer vsink_buffer ssink_sbuffer; do printf " &ff_%s,\n" $c >> $TMPH done fi diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index ec57a2c49c..f98e1a594c 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -555,8 +555,10 @@ extern const AVFilter ff_avsrc_movie; * being the same while having different 'types'). */ extern const AVFilter ff_asrc_abuffer; extern const AVFilter ff_vsrc_buffer; +extern const AVFilter ff_ssrc_sbuffer; extern const AVFilter ff_asink_abuffer; extern const AVFilter ff_vsink_buffer; +extern const AVFilter ff_ssink_sbuffer; extern const AVFilter ff_af_afifo; extern const AVFilter ff_vf_fifo; diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index c0215669e7..0b268c2fa4 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -29,6 +29,8 @@ #include "libavutil/internal.h" #include "libavutil/opt.h" +#include "libavcodec/avcodec.h" + #define FF_INTERNAL_FIELDS 1 #include "framequeue.h" @@ -57,6 +59,10 @@ typedef struct BufferSinkContext { int *sample_rates; ///< list of accepted sample rates int sample_rates_size; + /* only used for subtitles */ + enum AVSubtitleType *subtitle_types; ///< list of accepted subtitle types, must be terminated with -1 + int subtitle_types_size; + AVFrame *peeked_frame; } BufferSinkContext; @@ -305,6 +311,28 @@ static int asink_query_formats(AVFilterContext *ctx) return 0; } +static int ssink_query_formats(AVFilterContext *ctx) +{ + BufferSinkContext *buf = ctx->priv; + AVFilterFormats *formats = NULL; + unsigned i; + int ret; + + CHECK_LIST_SIZE(subtitle_types) + if (buf->subtitle_types_size) { + for (i = 0; i < NB_ITEMS(buf->subtitle_types); i++) + if ((ret = ff_add_subtitle_type(&formats, buf->subtitle_types[i])) < 0) + return ret; + if ((ret = ff_set_common_formats(ctx, formats)) < 0) + return ret; + } else { + if ((ret = ff_default_query_formats(ctx)) < 0) + return ret; + } + + return 0; +} + #define OFFSET(x) offsetof(BufferSinkContext, x) #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM static const AVOption buffersink_options[] = { @@ -322,9 +350,16 @@ static const AVOption abuffersink_options[] = { { NULL }, }; #undef FLAGS +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_SUBTITLE_PARAM +static const AVOption sbuffersink_options[] = { + { "subtitle_types", "set the supported subtitle formats", OFFSET(subtitle_types), AV_OPT_TYPE_BINARY, .flags = FLAGS }, + { NULL }, +}; +#undef FLAGS AVFILTER_DEFINE_CLASS(buffersink); AVFILTER_DEFINE_CLASS(abuffersink); +AVFILTER_DEFINE_CLASS(sbuffersink); static const AVFilterPad avfilter_vsink_buffer_inputs[] = { { @@ -363,3 +398,22 @@ const AVFilter ff_asink_abuffer = { .outputs = NULL, FILTER_QUERY_FUNC(asink_query_formats), }; + +static const AVFilterPad avfilter_ssink_sbuffer_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_SUBTITLE, + }, +}; + +const AVFilter ff_ssink_sbuffer = { + .name = "sbuffersink", + .description = NULL_IF_CONFIG_SMALL("Buffer subtitle frames, and make them available to the end of the filter graph."), + .priv_class = &sbuffersink_class, + .priv_size = sizeof(BufferSinkContext), + .init = common_init, + .activate = activate, + FILTER_INPUTS(avfilter_ssink_sbuffer_inputs), + .outputs = NULL, + FILTER_QUERY_FUNC(ssink_query_formats), +}; diff --git a/libavfilter/buffersink.h b/libavfilter/buffersink.h index 69ed0f29a8..11905abdc5 100644 --- a/libavfilter/buffersink.h +++ b/libavfilter/buffersink.h @@ -129,6 +129,13 @@ typedef struct AVABufferSinkParams { */ attribute_deprecated AVABufferSinkParams *av_abuffersink_params_alloc(void); + +/** + * Deprecated and unused struct to use for initializing an sbuffersink context. + */ +typedef struct AVSBufferSinkParams { + const int *subtitle_type; +} AVSBufferSinkParams; #endif /** diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index b0611872f1..d2362999a2 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -39,6 +39,7 @@ #include "formats.h" #include "internal.h" #include "video.h" +#include "libavcodec/avcodec.h" typedef struct BufferSourceContext { const AVClass *class; @@ -63,6 +64,9 @@ typedef struct BufferSourceContext { uint64_t channel_layout; char *channel_layout_str; + /* subtitle only */ + enum AVSubtitleType subtitle_type; + int eof; } BufferSourceContext; @@ -130,6 +134,13 @@ int av_buffersrc_parameters_set(AVFilterContext *ctx, AVBufferSrcParameters *par if (param->channel_layout) s->channel_layout = param->channel_layout; break; + case AVMEDIA_TYPE_SUBTITLE: + s->subtitle_type = param->format; + if (param->width > 0) + s->w = param->width; + if (param->height > 0) + s->h = param->height; + break; default: return AVERROR_BUG; } @@ -197,6 +208,8 @@ int attribute_align_arg av_buffersrc_add_frame_flags(AVFilterContext *ctx, AVFra CHECK_AUDIO_PARAM_CHANGE(ctx, s, frame->sample_rate, frame->channel_layout, frame->channels, frame->format, frame->pts); break; + case AVMEDIA_TYPE_SUBTITLE: + break; default: return AVERROR(EINVAL); } @@ -269,6 +282,7 @@ unsigned av_buffersrc_get_nb_failed_requests(AVFilterContext *buffer_src) #define OFFSET(x) offsetof(BufferSourceContext, x) #define A AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_AUDIO_PARAM #define V AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM +#define S AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_SUBTITLE_PARAM static const AVOption buffer_options[] = { { "width", NULL, OFFSET(w), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, V }, @@ -298,6 +312,16 @@ static const AVOption abuffer_options[] = { AVFILTER_DEFINE_CLASS(abuffer); +static const AVOption sbuffer_options[] = { + { "time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, INT_MAX, S }, + { "subtitle_type", NULL, OFFSET(subtitle_type), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, S }, + { "width", NULL, OFFSET(w), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, V }, + { "height", NULL, OFFSET(h), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, V }, + { NULL }, +}; + +AVFILTER_DEFINE_CLASS(sbuffer); + static av_cold int init_audio(AVFilterContext *ctx) { BufferSourceContext *s = ctx->priv; @@ -347,6 +371,21 @@ static av_cold int init_audio(AVFilterContext *ctx) return ret; } +static av_cold int init_subtitle(AVFilterContext *ctx) +{ + BufferSourceContext *c = ctx->priv; + + if (c->subtitle_type == AV_SUBTITLE_FMT_BITMAP) + av_log(ctx, AV_LOG_VERBOSE, "graphical subtitles - w:%d h:%d tb:%d/%d\n", + c->w, c->h, c->time_base.num, c->time_base.den); + else + av_log(ctx, AV_LOG_VERBOSE, "text subtitles - w:%d h:%d tb:%d/%d\n", + c->w, c->h, c->time_base.num, c->time_base.den); + + return 0; +} + + static av_cold void uninit(AVFilterContext *ctx) { BufferSourceContext *s = ctx->priv; @@ -381,6 +420,11 @@ static int query_formats(AVFilterContext *ctx) if ((ret = ff_set_common_channel_layouts(ctx, channel_layouts)) < 0) return ret; break; + case AVMEDIA_TYPE_SUBTITLE: + if ((ret = ff_add_format (&formats, c->subtitle_type)) < 0 || + (ret = ff_set_common_formats (ctx , formats )) < 0) + return ret; + break; default: return AVERROR(EINVAL); } @@ -408,6 +452,11 @@ static int config_props(AVFilterLink *link) if (!c->channel_layout) c->channel_layout = link->channel_layout; break; + case AVMEDIA_TYPE_SUBTITLE: + link->format = c->subtitle_type; + link->w = c->w; + link->h = c->h; + break; default: return AVERROR(EINVAL); } @@ -472,3 +521,26 @@ const AVFilter ff_asrc_abuffer = { FILTER_QUERY_FUNC(query_formats), .priv_class = &abuffer_class, }; + +static const AVFilterPad ssrc_sbuffer_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_SUBTITLE, + .request_frame = request_frame, + .config_props = config_props, + }, +}; + +const AVFilter ff_ssrc_sbuffer = { + .name = "sbuffer", + .description = NULL_IF_CONFIG_SMALL("Buffer subtitle frames, and make them accessible to the filterchain."), + .priv_size = sizeof(BufferSourceContext), + + .init = init_subtitle, + .uninit = uninit, + + .inputs = NULL, + FILTER_OUTPUTS(ssrc_sbuffer_outputs), + FILTER_QUERY_FUNC(query_formats), + .priv_class = &sbuffer_class, +}; diff --git a/libavfilter/buffersrc.h b/libavfilter/buffersrc.h index 08fbd18a47..929a2fa249 100644 --- a/libavfilter/buffersrc.h +++ b/libavfilter/buffersrc.h @@ -74,6 +74,7 @@ typedef struct AVBufferSrcParameters { /** * video: the pixel format, value corresponds to enum AVPixelFormat * audio: the sample format, value corresponds to enum AVSampleFormat + * subtitles: the subtitle format, value corresponds to enum AVSubtitleType */ int format; /**