From patchwork Sun Dec 5 19:41:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 32014 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3628891iog; Sun, 5 Dec 2021 11:43:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJyUlRlkIajgweVbzK1hLMM55zX07Y9h5epv3BP62byI3Mivb7tr4JysE80YMVEhrYXY8tIT X-Received: by 2002:a17:907:720b:: with SMTP id dr11mr40858621ejc.93.1638733410500; Sun, 05 Dec 2021 11:43:30 -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 sc33si18913598ejc.409.2021.12.05.11.43.30; Sun, 05 Dec 2021 11:43:30 -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=Nsjpe2L3; 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 C7F5E68AFBC; Sun, 5 Dec 2021 21:41:55 +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-dm6nam10olkn2053.outbound.protection.outlook.com [40.92.41.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E76568AF21 for ; Sun, 5 Dec 2021 21:41:48 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QLns4tBQhr9Gc/73G4nsDoQl159UraQOmAkh/APoqUXXmTtRcNjuDEH/4lTQn1W47jVKS/hM/UE8vQX3mPKqelHsma3MdqDWHzLqzt2tGrjaWk1nI/E0nAtLNznAohBPvf2vtEQz1LdevMxDYphHRUWRmJ2IHBpriccimfRneuPTYJVbJsqBA4m2DYPWf4e3l6REHbdcVDJjaKg3lYlaRepYWDKwLJHk6Pm0WSUUr5ugf9jTb+ixlrChY8QzuGPYsifpxgCIRbgP1J190S8fhVUi/s2SboQtkdEtBxHjZBzMSWpFYjFH0mvSsT+SxojjJgVTDSBUb8trIzrrbhmyYA== 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=WMKluBZCjdZmdi19TY7sudXx2y/WVIOyIbOyBoTAx6c=; b=AbuuFXdXGtZNoS81G+wKYzicpoa6lhOfSTTBJtaSz7YBIeYOtFPbQLK0qmFmO2Di7VL7Bh9s+YYvy8hCE0N9dXU96uJ6tRJodHTpNf18fxkfaK3q/PghSwZc62fxZiwph9oc0b5KjD7z8In5cH3WkXbzuZ4cNh4YgDmU0AaToCR35YUsdEQVIq3PuAeYMpjCWjv7o4jCmvZmQE80KFC3yRBiyb2VgpsWxkLInXF0EPlVhWuE8h7qDcTaLWfunRHFhVXS9Cepvg7MiSTByY8MG+vQpYRckT02z6kHw+V9M0DgLhoG0C5frhDHDqhAX2eO1WsWfXANHn3dindotPBf5g== 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=WMKluBZCjdZmdi19TY7sudXx2y/WVIOyIbOyBoTAx6c=; b=Nsjpe2L35kLDBqapkq2HMAjWcByhFqq6x2MWDD2KDO12UhTgIMqWPOZHlQKY6M9o5I3CGp42DZz+Y6hKg9QCwZln3dMrcANlhPFDA/1IqUUeh/Ij4JOpoARg8DrK3NQDwNJTmvorEb0kTp/Tq+c4Ggsjgt/D/OHI3Mtq5S0Z0RHKifq/3/3m4NZ8n4V7TLsnsC05opRh6QU9fvCAEv4UgFhgdrr2yGPy+s1ihpPEDt2UAcfLEnPIQux3oIH2/6Kzzuh7tOAYaOxoIw2+0Ql59JKCiftZqz6R+KpikqSyK5sCbH2M1om8I4ZToaV5wMMxnQ8cuq3MiID0/fn2sMtTiw== 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:47 +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:47 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v21 11/20] avfilter/sbuffer: Add sbuffersrc and sbuffersink filters Thread-Index: AQHX6hAjNnm0w/qlmEWSOgKRyQyxqA== Date: Sun, 5 Dec 2021 19:41:46 +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> <65fed074109cab2b1dc123b0f37e85890dea528b.1638733198.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: [HECID/awagN0P1o5C5nja85Se9yKPfat13e0nLWDIcLktI7alvmtJOHOU05yXSPO] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 4982509a-aec5-4b54-c208-08d9b827462e x-ms-traffictypediagnostic: DM8P223MB0320: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: tCQrllf7Y0rDmvOGgBLbLiPGy9XrheUxGiKC6k9B4HfyVCVEyGkN0BJOq/PIhEqnhNmTAtEpXi5HkXI5hxbSQ9yri0BpoqQEJMrn1OE0dfHaeG2SIXXz5St+tupuZjps0TaVvSJKnKOjJ77dcPMmIasT5UVEJouba6dpild0IRHjmPo9ubeFS4+N+IozdFQe3uWZZv2CehfsLMQFSOolJfbgGEqBhDubmn/2D3RSU7N0ZA/c13nG52HxHv+PFl0VsJuEuQVxg3I2FZ8G5GhyV5eOkW4Z6Kv+dA5wHEE0msb9J9QIAHmrvqqeXrkb0vxUzR4FwnVxMm4IcvEXOqp5+1tHrObk573Rwb2S1CC5YXhCH8zaBxICHykhpEVSEXFeFgbM/QnsC1B4FcX3TNApb33fZW4LRKtQ4SnS3Gbo891ksQRftwUKtjeuWSGfyHLg4ppZvwByV/Vsq4G8b7Z7thoqrkebkh0HMu6yE8OHBbeP+i4I/TN0GqdV3FbKkhVaatTTXygGSkhHbzChdCTyzUbwSmZuXIEThkQM5hlvof6AFS2cHS3hEKpHmz+kcO0G6CeiRlYnH9ECxg0v4krhNg== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?/pWY+pQE+GERKeJCuzmhtkbrdEKj?= =?utf-8?q?6ii80T46VamjslrjqgllQj6SbJurfpYvBSXNdj8xw0AdMqCUEbpmSMSdgCoKQgAx2?= =?utf-8?q?I73k5eIJoBm6QxVpFHEC8C81qDguyEWjvbHsO/XHZLQacqDumo7tNB3aW/vkUZSlh?= =?utf-8?q?JNpUhOCutYXR5qDhZQ5l0tlM7z1Fkmp8dbQEV6hVKNamQcxgD+HAT6m/kf+CYCFPM?= =?utf-8?q?lXGO82YH/m6JZbHIxHG9Vm9pU4glNPMTw27KFh3Ioykm/dlqLpuklxMVys3h/018p?= =?utf-8?q?jojf7QwuRTgnraIdbNJIEfexkrtOR0gJnMEVnnOuURCv9u6qTHL+yZCjHV06sWR4l?= =?utf-8?q?R76FxH7uXphjgx+obe///O04uHre/rnl568lnQgZSdzBmiiHfH4DaqQ8x8WzGxdkb?= =?utf-8?q?m91BBeP3h3Igmr5sL7ZDbz21ecehBQ7Aw/5RK2ImWM0QNjMcCeeNC4m5XkdmS2lIr?= =?utf-8?q?TRxRYUSg+/G/CoIoxDnTE6TpxfBkWvurRokfAyIcewMGVDfpBed614FV8pdJBrSlV?= =?utf-8?q?cd6RSShOz0afGiZP7Ns8zRbCEdKNWLtS81z2gN/3HQ1RBm60uKG9o70UNLHG7oUBN?= =?utf-8?q?o4prxaG8ovcwHfGP1CKMWRItBuBRYR0n8hZNXVeHZ3orEdjpF3PhY708ebqM4gSjL?= =?utf-8?q?Thq8FcWdRYTjyxBIW9XDY+HbdGe4G5Nf5ivGFbOS9OAwf3dm+rC1eVkslnkRgGTNM?= =?utf-8?q?pfCLtZStF9nWsruNutNi1yqSTh+b/B6bbaE/13wKCNEEkLeYwer164H3BprTs7nOl?= =?utf-8?q?h2B8LLdabo6xradj2AKgv3+nnYtG9YutSlF/ACUb56dcFYa1En3BgqBDr1AJBAvlh?= =?utf-8?q?VruXWF4lX8v6nbnY9lHbzi3AbujeWDnyIoG7+Up7prdSdS8U2p4PapoEhlLbQ1QqD?= =?utf-8?q?6GzvigcdkdYbSR2MfR/8IYwID0irv4p+srpGESqS89SrTw5f+KHSeP8wwh050rr0Y?= =?utf-8?q?ARgmfJ2XdolQRxvo6zj+jf7IUZxTjVitpWWyalJP1KA=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: 4982509a-aec5-4b54-c208-08d9b827462e X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Dec 2021 19:41:46.9643 (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 11/20] 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: hLhJN589cU+l 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 a98a18abaa..ea4c722a94 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; /**