/**
* @file
- * buffer video sink
+ * buffer sink
*/
#include "libavutil/avassert.h"
typedef struct {
AVFifoBuffer *fifo; ///< FIFO buffer of video frame references
+ unsigned warning_limit;
/* only used for video */
enum PixelFormat *pixel_fmts; ///< list of accepted pixel formats, must be terminated with -1
av_log(ctx, AV_LOG_ERROR, "Failed to allocate fifo\n");
return AVERROR(ENOMEM);
}
+ buf->warning_limit = 100;
return 0;
}
}
}
-static void end_frame(AVFilterLink *inlink)
+static int end_frame(AVFilterLink *inlink)
{
AVFilterContext *ctx = inlink->dst;
BufferSinkContext *buf = inlink->dst->priv;
av_log(ctx, AV_LOG_ERROR,
"Cannot buffer more frames. Consume some available frames "
"before adding new ones.\n");
- return;
+ return AVERROR(ENOMEM);
}
}
/* cache frame */
av_fifo_generic_write(buf->fifo,
&inlink->cur_buf, sizeof(AVFilterBufferRef *), NULL);
+ inlink->cur_buf = NULL;
+ if (buf->warning_limit &&
+ av_fifo_size(buf->fifo) / sizeof(AVFilterBufferRef *) >= buf->warning_limit) {
+ av_log(ctx, AV_LOG_WARNING,
+ "%d buffers queued in %s, something may be wrong.\n",
+ buf->warning_limit,
+ (char *)av_x_if_null(ctx->name, ctx->filter->name));
+ buf->warning_limit *= 10;
+ }
+ return 0;
+}
+
+void av_buffersink_set_frame_size(AVFilterContext *ctx, unsigned frame_size)
+{
+ AVFilterLink *inlink = ctx->inputs[0];
+
+ inlink->min_samples = inlink->max_samples =
+ inlink->partial_buf_size = frame_size;
}
int av_buffersink_get_buffer_ref(AVFilterContext *ctx,
int ret;
*bufref = NULL;
+ av_assert0(!strcmp(ctx->filter->name, "buffersink") || !strcmp(ctx->filter->name, "abuffersink"));
+
/* no picref available, fetch it from the filterchain */
if (!av_fifo_size(buf->fifo)) {
if (flags & AV_BUFFERSINK_FLAG_NO_REQUEST)
return AVERROR(EAGAIN);
- if ((ret = avfilter_request_frame(inlink)) < 0)
+ if ((ret = ff_request_frame(inlink)) < 0)
return ret;
}
return 0;
}
+AVRational av_buffersink_get_frame_rate(AVFilterContext *ctx)
+{
+ av_assert0(!strcmp(ctx->filter->name, "buffersink"));
+
+ return ctx->inputs[0]->frame_rate;
+}
+
int av_buffersink_poll_frame(AVFilterContext *ctx)
{
BufferSinkContext *buf = ctx->priv;
AVFilterLink *inlink = ctx->inputs[0];
- return av_fifo_size(buf->fifo)/sizeof(AVFilterBufferRef *) + avfilter_poll_frame(inlink);
-}
+ av_assert0(!strcmp(ctx->filter->name, "buffersink") || !strcmp(ctx->filter->name, "abuffersink"));
-#if FF_API_OLD_VSINK_API
-int av_vsink_buffer_get_video_buffer_ref(AVFilterContext *ctx,
- AVFilterBufferRef **picref, int flags)
-{
- return av_buffersink_get_buffer_ref(ctx, picref, flags);
+ return av_fifo_size(buf->fifo)/sizeof(AVFilterBufferRef *) + ff_poll_frame(inlink);
}
-#endif
#if CONFIG_BUFFERSINK_FILTER
static av_cold int vsink_init(AVFilterContext *ctx, const char *args, void *opaque)
{
BufferSinkContext *buf = ctx->priv;
- av_unused AVBufferSinkParams *params;
+ AVBufferSinkParams *params = opaque;
- if (!opaque) {
- av_log(ctx, AV_LOG_WARNING,
- "No opaque field provided\n");
- buf->pixel_fmts = NULL;
- } else {
-#if FF_API_OLD_VSINK_API
- const int *pixel_fmts = (const enum PixelFormat *)opaque;
-#else
- params = (AVBufferSinkParams *)opaque;
+ if (params && buf->pixel_fmts) {
const int *pixel_fmts = params->pixel_fmts;
-#endif
+
buf->pixel_fmts = ff_copy_int_list(pixel_fmts);
if (!buf->pixel_fmts)
return AVERROR(ENOMEM);
{
BufferSinkContext *buf = ctx->priv;
av_freep(&buf->pixel_fmts);
- return common_uninit(ctx);
+ common_uninit(ctx);
}
static int vsink_query_formats(AVFilterContext *ctx)
BufferSinkContext *buf = ctx->priv;
if (buf->pixel_fmts)
- avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(buf->pixel_fmts));
+ ff_set_common_formats(ctx, ff_make_format_list(buf->pixel_fmts));
else
- avfilter_default_query_formats(ctx);
+ ff_default_query_formats(ctx);
return 0;
}
.name = "buffersink",
.description = NULL_IF_CONFIG_SMALL("Buffer video frames, and make them available to the end of the filter graph."),
.priv_size = sizeof(BufferSinkContext),
- .init = vsink_init,
+ .init_opaque = vsink_init,
.uninit = vsink_uninit,
.query_formats = vsink_query_formats,
#if CONFIG_ABUFFERSINK_FILTER
-static void filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref)
+static int filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref)
{
end_frame(link);
+ return 0;
}
static av_cold int asink_init(AVFilterContext *ctx, const char *args, void *opaque)
{
BufferSinkContext *buf = ctx->priv;
- AVABufferSinkParams *params;
+ AVABufferSinkParams *params = opaque;
- if (!opaque) {
- av_log(ctx, AV_LOG_ERROR,
- "No opaque field provided, an AVABufferSinkParams struct is required\n");
- return AVERROR(EINVAL);
- } else
- params = (AVABufferSinkParams *)opaque;
-
- buf->sample_fmts = ff_copy_int_list (params->sample_fmts);
- buf->channel_layouts = ff_copy_int64_list(params->channel_layouts);
- if (!buf->sample_fmts || !buf->channel_layouts) {
- av_freep(&buf->sample_fmts);
- av_freep(&buf->channel_layouts);
- return AVERROR(ENOMEM);
+ if (params && params->sample_fmts) {
+ buf->sample_fmts = ff_copy_int_list (params->sample_fmts);
+ if (!buf->sample_fmts)
+ goto fail_enomem;
}
+ if (params && params->channel_layouts) {
+ buf->channel_layouts = ff_copy_int64_list(params->channel_layouts);
+ if (!buf->channel_layouts)
+ goto fail_enomem;
+ }
+ if (!common_init(ctx))
+ return 0;
- return common_init(ctx);
+fail_enomem:
+ av_freep(&buf->sample_fmts);
+ av_freep(&buf->channel_layouts);
+ return AVERROR(ENOMEM);
}
static av_cold void asink_uninit(AVFilterContext *ctx)
av_freep(&buf->sample_fmts);
av_freep(&buf->channel_layouts);
- return common_uninit(ctx);
+ common_uninit(ctx);
}
static int asink_query_formats(AVFilterContext *ctx)
AVFilterFormats *formats = NULL;
AVFilterChannelLayouts *layouts = NULL;
- if (!(formats = avfilter_make_format_list(buf->sample_fmts)))
+ if (buf->sample_fmts) {
+ if (!(formats = ff_make_format_list(buf->sample_fmts)))
return AVERROR(ENOMEM);
- avfilter_set_common_sample_formats(ctx, formats);
+ ff_set_common_formats(ctx, formats);
+ }
+ if (buf->channel_layouts) {
if (!(layouts = avfilter_make_format64_list(buf->channel_layouts)))
return AVERROR(ENOMEM);
ff_set_common_channel_layouts(ctx, layouts);
- ff_set_common_samplerates (ctx, ff_all_samplerates());
+ }
return 0;
}
AVFilter avfilter_asink_abuffersink = {
.name = "abuffersink",
.description = NULL_IF_CONFIG_SMALL("Buffer audio frames, and make them available to the end of the filter graph."),
- .init = asink_init,
+ .init_opaque = asink_init,
.uninit = asink_uninit,
.priv_size = sizeof(BufferSinkContext),
.query_formats = asink_query_formats,
projects / ffmpeg / blobdiff