[FFmpeg-devel] [PATCH v4 12/23] avfilter/sbuffer: Add sbuffersrc and sbuffersink filters
softworkz
ffmpegagent at gmail.com
Sat May 28 16:25:12 EEST 2022
From: softworkz <softworkz at hotmail.com>
Signed-off-by: softworkz <softworkz at hotmail.com>
---
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 5a167613a4..c26bcdebc6 100755
--- a/configure
+++ b/configure
@@ -7879,7 +7879,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 2409964e53..1fe6132e0c 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -569,8 +569,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 e269cf72d1..204e9bad6c 100644
--- a/libavfilter/buffersink.c
+++ b/libavfilter/buffersink.c
@@ -30,6 +30,8 @@
#include "libavutil/internal.h"
#include "libavutil/opt.h"
+#include "libavcodec/avcodec.h"
+
#define FF_INTERNAL_FIELDS 1
#include "framequeue.h"
@@ -61,6 +63,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;
@@ -372,6 +378,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_format(&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[] = {
@@ -395,9 +423,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[] = {
{
@@ -436,3 +471,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 01e7c747d8..42c164e670 100644
--- a/libavfilter/buffersink.h
+++ b/libavfilter/buffersink.h
@@ -128,6 +128,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 a3190468bb..1679c54f17 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 {
char *channel_layout_str;
AVChannelLayout ch_layout;
+ /* subtitle only */
+ enum AVSubtitleType subtitle_type;
+
int eof;
} BufferSourceContext;
@@ -143,6 +147,13 @@ FF_ENABLE_DEPRECATION_WARNINGS
return ret;
}
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;
}
@@ -224,6 +235,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
CHECK_AUDIO_PARAM_CHANGE(ctx, s, frame->sample_rate, frame->ch_layout,
frame->format, frame->pts);
break;
+ case AVMEDIA_TYPE_SUBTITLE:
+ break;
default:
return AVERROR(EINVAL);
}
@@ -296,6 +309,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 },
@@ -325,6 +339,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;
@@ -393,6 +417,21 @@ FF_ENABLE_DEPRECATION_WARNINGS
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;
@@ -426,6 +465,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);
}
@@ -456,6 +500,11 @@ static int config_props(AVFilterLink *link)
return ret;
}
break;
+ case AVMEDIA_TYPE_SUBTITLE:
+ link->format = c->subtitle_type;
+ link->w = c->w;
+ link->h = c->h;
+ break;
default:
return AVERROR(EINVAL);
}
@@ -520,3 +569,26 @@ const AVFilter ff_asrc_abuffer = {
FILTER_QUERY_FUNC(query_formats),
.priv_class = &abuffer_class,
};
+
+static const AVFilterPad avfilter_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(avfilter_ssrc_sbuffer_outputs),
+ FILTER_QUERY_FUNC(query_formats),
+ .priv_class = &sbuffer_class,
+};
diff --git a/libavfilter/buffersrc.h b/libavfilter/buffersrc.h
index 3b248b37cd..45a657bbb6 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;
/**
--
ffmpeg-codebot
More information about the ffmpeg-devel
mailing list