From patchwork Sat Nov 27 19:37:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31777 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp4019624iob; Sat, 27 Nov 2021 11:39:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJzpsFnR1syLGbFLpV5ZC/hiExfd6t8dEbrdOXbqYRawe2jp4LmZE+vgjiin2PpNHG6KI0UE X-Received: by 2002:a17:907:96a6:: with SMTP id hd38mr46255122ejc.47.1638041982542; Sat, 27 Nov 2021 11:39:42 -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 z2si16146152ejm.238.2021.11.27.11.39.42; Sat, 27 Nov 2021 11:39:42 -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=Zqebi+UD; 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 AEC8368AC4D; Sat, 27 Nov 2021 21:38:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11olkn2066.outbound.protection.outlook.com [40.92.20.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D023468AC9C for ; Sat, 27 Nov 2021 21:38:01 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bjVkT0AP1Bh0l69C5bOruKk+A2A0CCrVbmm2vUiLIsXr506ZjvvU2vm4bfc2ANAe+LQZlfXA96UJ10Jb9simYSqwudrlBWvDOtpQo3qv4v0YChLmOQzX3ZeBVqGF8APAxcb+ohnPCn5E1eKVm3DqIDKlnFp+dAckehXKzz444C2o96Ncmclc6O2CJYHwAj9JK1mlwZBm1oScC14itltn9mUvIKaX43KPDZXlLaEUjL3rATh5/huFpwqO7zpItpBIhIU32ar2DjjV2LL3heffo+t4k9CyYTf1NRWNP3Dy+bRZMynqyalbXjjOQ3SlsvzitSIpgvSkHsdRqoEjyHTu2A== 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=IwPjjcDobWBrgWMJKcJQcXepunxLH7rPm78iCjbvtQ4=; b=gsBolptPif6Q/ZvsC7IcVv3wAq05vUNkPz1TOn1T6uBSJLjoS0Vj+QLeAGVN7mPkRtXzHMfHTqGOOC2pT19Ek4uPdX93JpJaK2+SvWjXVnjTtVkkdQFhgD7eKm8JS6wdKVd9Jg4taHOYa4maYtQfkffPjIj1a1sh/LitOH2s57HaSJatSCVN81oUBKHKbb0BMxRf2a8nx40rQy4GFczro9jjiOWDH5sH6OCrhi6q2OqvbZ8QYZ6CASZSmKxPAQjKgoM/fRE1rwhzGMTSTf+5rxdGMVTcNAXwfkdf+J6cOXiXlixqBA19UZkUCt1cRgiu0XpYzQpGlXfAjmhzbymYDg== 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=IwPjjcDobWBrgWMJKcJQcXepunxLH7rPm78iCjbvtQ4=; b=Zqebi+UD8A8DkV9zmeqyR7ep3pOtVMLa2LmS+jIpS01CJeQfnz5UEyZcMB1UxtBgEMNwnOQMfUrMhRarTbRp4mCbZrZKSPRVBfpm1EBy78N+e7mHq2CP0oIVhauyDWkrLIyeCSWcYxDTAtdcyhJujIwpB131NZ4HAimIqvQ9VckDOqqhugQ4SwvyONJS0NcuLd5I4al6p9UquoDfoRBWpoyPU44jWTS1vFY32XtLp1m4M/VRQ+DHXU2D9YpHZiTXAdAkFh7gkazPwN9JKYcsOJlcvGMnU9RRkipW+jhsEtkDlCNu3lGdFlSEAbOuv4bsvmHERE31+gHcHeEvAkMXzw== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0398.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:5::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Sat, 27 Nov 2021 19:37:57 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775%5]) with mapi id 15.20.4734.022; Sat, 27 Nov 2021 19:37:57 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v17 10/19] avfilter/sbuffer: Add sbuffersrc and sbuffersink filters Thread-Index: AQHX48ZHlOE1McXQ4U+4Zzhc5AgDxw== Date: Sat, 27 Nov 2021 19:37:57 +0000 Message-ID: References: <7463f4e16ad074b56143d86846344e23a3594ef3.1638041335.git.softworkz@hotmail.com> <2931036119e295dd393764444287c4dd80d423f8.1638041335.git.softworkz@hotmail.com> <8aacfe4a7c5e4726ed39d46acaaef90bf5814218.1638041335.git.softworkz@hotmail.com> <8d80df6d4b54df71b170bbe8c354affd37137f8a.1638041335.git.softworkz@hotmail.com> <5e1287cba1f2ec854a8f50e46e4a8f59946d5371.1638041335.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: [N5EeqDVsRS9ODhRYz0hVYUJhfe7yu81c] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b573986a-422e-41c5-0fad-08d9b1dd6a0b x-ms-traffictypediagnostic: DM8P223MB0398: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 82Y9L8l3Ye2pDd5owfpFzRxHkfxrPr7Mk47gTNeWX1QQGE1uYQ5ahJukjyI/dPJAUzAkFfxYWhek91YabQWb7/wt0xbggbLoh9g8udvvi5dXt25mASdGQtvtFdx5eSiUU3oCb+HrG/rsDl69RAG83rEGCubvh3vQLSr4SY2r0SSVbwssqVUx/tery6UwYdg4BttfZe++idlvwVFpoKyQGCLuUa4v2LWEgohkFfo2tb3ihzMLL9slYPCV9xieRfVEoANQEIcNByDnAm3rvq/wHxlyximYv1d7kbVMrCXqolf6ke0OOyXncSurJQ/LJhxLHxd3lwoVfdWpj9oT8l/aToCFmd24ztk6llACQ/au93qWW0m4mGPUJwOxy2nAUcmIFqissyNkAIdJ1/5C1qNKucUL5pmBsdvkjf2uQUiArPi/+jyr9avwhJmPJUazcpo2CsVY70Pcx3YimyIfl7uQXhXXgvbCpeshBIjropGdBOFeoaTL9CrUrufWsIB+QUORnKTSFNqv6tbs0n1ubBAU0VJnPx9bmzgkoquDQckO4x5azq8s51bDcMd4NUybGan+S89r+2rN3TXZ6Jde5VMK0g== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 7Zck0E4mjYE99xsCUl+hC3z4PTlI53mErTFJfU+6DC+6flapD+EetXvg0ei/nInVS9bXI+f1dECh9OsvCw3H8IHpBQs2S/qa4QN3CwHKRwTXKL8uUoFygAXmxbXou+IMh3vlfqi9jwZXO3cidPaFMVRUoy0JzH7BCG4+vjQiz5miAkWvsbymfT71jP9hcGnxV8yLHEPEzrey+Ot5DLyF1aoezc+xv7tmzHbmfK0Hdahyt9X3//Nv9lwm2NIZrhhWn2VPkkZATcqLUdMTWDB+Ii9GitDxLSXCVXOLCFKoYQ7ROHCnckJdSEN/UU3HLwQzzR2BK+yJDRoU/zGXoV1EyYMn08/gOJbeBmMtWugSkhCSzXqHb5+j9BvTFuaXF4kwnXsDemnQlwh41QtdeBNdXrV35DlsnOx2ebi4KkcmWJpW6j4OilUKZms6UbwdXpvgrGqdsfsupuiYPalfpSKQo43a3vNQ5wgKbfoUJJG4e7/0LT+E8axEP8sVXuxLoSU46h2LaUKrOhZtu4bNruT/rzGX6sB0yXy6Nj+JbiUUfnqMUm6VAN+zbGV0yaRAeAsI33y0eAtguIImbDp9E6dy/axv4qgKNPk7lvuhfhPhH92joIDES3zoso1BZIzCmC5YeeH6SiBv3ligHOoc88WtX/MjjeDxFEJ+gnatlZ6ywS1W25TILgbVbbCHoDV382prDO8KtTCfILj6oS8Ez600Zg== MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3912-16-msonline-outlook-1fc6d.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: b573986a-422e-41c5-0fad-08d9b1dd6a0b X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Nov 2021 19:37:57.4236 (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: DM8P223MB0398 Subject: [FFmpeg-devel] [PATCH v17 10/19] 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: 7BZKIFrJUHSc 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 d068b11073..e4d1443237 100755 --- a/configure +++ b/configure @@ -7758,7 +7758,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 4bf17ef292..4072f08385 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -550,8 +550,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 b8ddafec35..3fa7b62439 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, terminated by -1 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; /**