From patchwork Fri Dec 10 21:37:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 32276 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2373840iog; Fri, 10 Dec 2021 13:39:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJy56WZdlu0r8sQwbcAcYreaBLV+BoOtf1Z698gG1Bopz6xLCBJMwU2BozSfn3AIbj6xFS5C X-Received: by 2002:a17:906:35d7:: with SMTP id p23mr26193892ejb.32.1639172357131; Fri, 10 Dec 2021 13:39:17 -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 dn23si5343304edb.556.2021.12.10.13.39.16; Fri, 10 Dec 2021 13:39:17 -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=jgrMK9rN; 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 1BDC368AF8A; Fri, 10 Dec 2021 23:37:39 +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-bn8nam12olkn2080.outbound.protection.outlook.com [40.92.21.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2AB9668AF82 for ; Fri, 10 Dec 2021 23:37:36 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bgUgyJuWm3HzETd79+z3EmsXsm0U2JalUVc9WJEIouQ8UEHmuZmRh3A/N5zKVDp1HSC+1371NHPQo0IIJqQfXnUNr4FOakNZ6WNI2/wyQEItNjLkDClVBeRRNrmP2g07ddHkIZDzBW11o644Qw1H3eOxBGR1oE3aniV+AYx7b3TVu3iyuo80xu4Dz+Q7k2JVqIH574+/ktc6xPMUIQCpX6eZ2aiYP2jGO2DpaQ5fCE/NxpOkNQOAIxUgNSRoEMXTzvG6ovcmFtrnNdtNN9o81m445RdJft8lYlePqjdJ3MBw96KuVO+ZYm7jb5O2myQCk9QNmRYUENpSuAMr2PozJg== 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=8FrYfeO855uTD0NwkfrTZcJlp/ew+nvLVgGbsWPpMh4=; b=M/d/uO+T5t927zD0RpKoC/LmHKJBRfWXi93ZGvn9KBgKjT+N+uw7Gixx1qLx5INJ0VNCGDn/p74H47cENihW749RBooOanifsAy8hbTWxEzQv96bY+JATOrsdiNNlzh2jxmsBK8sRTwiNPO8OJuIcz3u0bNxESj+/qesmEQVvcxHhJFYOyV+0UZqVe//XtlQ/CCSSxDWsHTcvjFz5F9ZC81VoxjUHs+KexI/yuu12Dk1WeF3jSM//cW5bZrooIi3C4Gur+LQYnCvYwvoJPQ2TZ33GTwJ4kwZRQwrSQ9ONQakM1nnbkqg9/BGYgSuen0K8kYMWeJvylMYmVB3z3ffsg== 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=8FrYfeO855uTD0NwkfrTZcJlp/ew+nvLVgGbsWPpMh4=; b=jgrMK9rNMeOXwJyIdYhqXIgGZdxS2vqrrc6lw6XVmUA9IdhhTuOqYzwdT6cwApLxbXNV6WDJBf3fz0WInKWne1ZscYTWk61UoHotUjfJLSVpt9KGNhJ5vpl9lqitexBPzWR0HlrlI2rzjIMt1YPZosdRVfcWMfx6ivXfCB4N230Yddx3TnL7BjB/1+WxAaqgy7U1VmSfz0T4L48mBu44RHmIseJzSspaqJxp77MCEuGCz8U7f16dlNRM4HYiuiT0m+GIAECjaZVgFD2yMPVfEsnDb3cXHSLxtemnedql1mM2kWZdvNLSeAqqP80JwuE0euOf5aDJFv7HdUG0QAKamA== 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:35 +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:35 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v23 11/21] avfilter/sbuffer: Add sbuffersrc and sbuffersink filters Thread-Index: AQHX7g4l1lazAZfQ20GquGHvndvkXQ== Date: Fri, 10 Dec 2021 21:37:35 +0000 Message-ID: References: <84c6ba3b99bf387e818d59f2161009ead8fb5767.1639172095.git.softworkz@hotmail.com> <0b41271ed30b530c1d55a9b824fc8bbbbd14fe5e.1639172095.git.softworkz@hotmail.com> <9f2875d043147119351f59b6410d718d170574e1.1639172095.git.softworkz@hotmail.com> <62a926e2d86310039653324bdf2a856f09a0fb46.1639172095.git.softworkz@hotmail.com> <75bb9ceffef9e8e2d05ffce8a51c1991d5d3a973.1639172095.git.softworkz@hotmail.com> <554aab35996d92c90ab3b0ecb2c0c6c1278479d6.1639172095.git.softworkz@hotmail.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [IqLaWpFBdcljDjCAFKoMJ17SjGBnzBDj] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ff85966a-8c04-46a7-3b1a-08d9bc25479e x-ms-traffictypediagnostic: DM8P223MB0397:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: pkPZNzwYV6dPKdz8POHbZALa9kzeRAwhiXcTu/nEaDHNcoJrFBAk3r+fKNsttjLUl2jcU9NWxu0U0oufRWs9tOuNyCfcoV1MU3Y5jlUjapQ8dboA6JneGntZDAcXnekUEUwV0zbYr4iP4y+0Qc5TwNog6zUV2SyLZ1QHlVQDZeMEm8C1xRTTru0UoF3po2g8uaThVk6vUb2PBWwzd2oHgvNv8t6uYDAPwPkUVG46JOrstmlcnODxM/5uka7otyyCqsFOWtxKBDXmPLvP8ve5aH+/R6dHAEzg1Ecml5AHfUf2POJyeM2JfOMQ5/kEwJ6pUtcWU1esesFOqYfkgl9teI3c0GNEAmGNqIU9gIjYWBUTDoI2fAF6KicqdtWkSFW8CSf773HoZzWNr83Gjt03R/0LED53Nfhtu8GtKUpycSzwbTh0Uv0XvkOU6lYi5E/hqG1ofYPS8iW2KRnTaVj4A94+GUT65qsVMfC4CInFUElERhpqXxDnvii6Pw1BZ/V07cw7oJ/UNHtP6r2xzpTbLc5PCDXhAVsUTh9eco9/Ustmm7zTFu4Z2TgOkrDdSxUdUe0UKXDTk9NlH1yRVOTgsg== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?M8JjTO5qWe/J5klIYBfxQfu3HJvi?= =?utf-8?q?IsRYz98rNfWCs7FB+p98aE7S64Ln3VQg65WMJ956RLzCxFVf7mLKajfoZf6keaetv?= =?utf-8?q?zVL9XdwGK7I7ZyKme8FzQbn6jLGteu+EgHeytHgVRKKA8LpHIyBGr4ZgjyZ+HZGEJ?= =?utf-8?q?mOowNr2Q9W8zX+hQbKt3pnEvKAgL2gk0n3SXWj9klNURwUTB7v8Hjp3keZ2IxcHzs?= =?utf-8?q?G0BiXQHRvHQxinctUGv3XmH4Nx2mSGARGqlx/INFFifacfJfqlzEwoNC1PTsHGn4y?= =?utf-8?q?1r7oupTOnn1XGtIVnmY5AhSBtLoyoCzSP1Y21ZVMR8SvqbhDCmXIwZDMEsLa9cgH0?= =?utf-8?q?L49V5Iemz+CXMaTgjs6mWa6x7jfsnhGm1SjrdY8cpQIPv9lM8mhuxWOWhQgTMQ9s8?= =?utf-8?q?hH6zSxPa1HNw7caDSEzlsCkIrcoE0cB/C9LeY41X3H7XTDG22hyTrbZVEHISG99sc?= =?utf-8?q?BrkTUhcEgHqoE/V09hLS1+zlDIDOol/ORIEAa8ORYntuhaVJ2cnE234LA5LFjvQTx?= =?utf-8?q?VfY/iFAr7dnsrgY4rD1pZXSLP41DXnqnknN3OLFt94CSfAuLcCRFWgH7khPRK6VFP?= =?utf-8?q?MVEJ2XznulWhLRey4CIb7atXXGfQ5BjdrGbJud7BR2DLq4X6o/W9nl9Pws8kD4pSm?= =?utf-8?q?gxIByxO6jxn3URQNqWKAUqnOB+wWzTKK74m4Hssp66oIQ/brRHf/IBAWuBN6Fd6jF?= =?utf-8?q?R/+QiH5HbHdX6ez7B8k6T2wEIu+wb3LuUVnU1dLHTueeo3JuxL6Xj5VONA9Qaoig7?= =?utf-8?q?TW+F8R5glQDO/sEnINSlNOjOkLgiuzM+Syccp9v7rDngXbpxQw007DAxvs4Wc45u3?= =?utf-8?q?zdZGrtCEDWzo+rlxZJ5G2tOaCL8QQfbJru8n0nRhrMJzzIFLX/+vy3YGKhV8vEhUS?= =?utf-8?q?vUOQ3J2Bku6Aa6H+quPt/o6ab6hdtTHCv6Heg8MFP2Gw=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: ff85966a-8c04-46a7-3b1a-08d9bc25479e X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Dec 2021 21:37:35.0711 (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 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: zy8Lzv6l7mh7 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 04f319b197..7b203d2bf2 100755 --- a/configure +++ b/configure @@ -7808,7 +7808,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 b1af2cbcc8..e134ac8059 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -553,8 +553,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; /**