} BufferSinkContext;
#define NB_ITEMS(list) (list ## _size / sizeof(*list))
+#define FIFO_INIT_SIZE 8
+#define FIFO_INIT_ELEMENT_SIZE sizeof(void *)
static av_cold void uninit(AVFilterContext *ctx)
{
av_audio_fifo_free(sink->audio_fifo);
if (sink->fifo) {
- while (av_fifo_size(sink->fifo) >= sizeof(AVFilterBufferRef *)) {
+ while (av_fifo_size(sink->fifo) >= FIFO_INIT_ELEMENT_SIZE) {
av_fifo_generic_read(sink->fifo, &frame, sizeof(frame), NULL);
av_frame_free(&frame);
}
{
BufferSinkContext *buf = ctx->priv;
- if (av_fifo_space(buf->fifo) < sizeof(AVFilterBufferRef *)) {
+ if (av_fifo_space(buf->fifo) < FIFO_INIT_ELEMENT_SIZE) {
/* realloc fifo size */
if (av_fifo_realloc2(buf->fifo, av_fifo_size(buf->fifo) * 2) < 0) {
av_log(ctx, AV_LOG_ERROR,
}
/* cache frame */
- av_fifo_generic_write(buf->fifo, &ref, sizeof(AVFilterBufferRef *), NULL);
+ av_fifo_generic_write(buf->fifo, &ref, FIFO_INIT_ELEMENT_SIZE, NULL);
return 0;
}
if ((ret = add_buffer_ref(ctx, frame)) < 0)
return ret;
if (buf->warning_limit &&
- av_fifo_size(buf->fifo) / sizeof(AVFilterBufferRef *) >= buf->warning_limit) {
+ av_fifo_size(buf->fifo) / FIFO_INIT_ELEMENT_SIZE >= buf->warning_limit) {
av_log(ctx, AV_LOG_WARNING,
"%d buffers queued in %s, something may be wrong.\n",
buf->warning_limit,
return params;
}
-#define FIFO_INIT_SIZE 8
-
static av_cold int common_init(AVFilterContext *ctx)
{
BufferSinkContext *buf = ctx->priv;
- buf->fifo = av_fifo_alloc_array(FIFO_INIT_SIZE, sizeof(AVFilterBufferRef *));
+ buf->fifo = av_fifo_alloc_array(FIFO_INIT_SIZE, FIFO_INIT_ELEMENT_SIZE);
if (!buf->fifo) {
av_log(ctx, AV_LOG_ERROR, "Failed to allocate fifo\n");
return AVERROR(ENOMEM);
inlink->partial_buf_size = frame_size;
}
-#if FF_API_AVFILTERBUFFER
-FF_DISABLE_DEPRECATION_WARNINGS
-static void compat_free_buffer(AVFilterBuffer *buf)
-{
- AVFrame *frame = buf->priv;
- av_frame_free(&frame);
- av_free(buf);
-}
-
-static int compat_read(AVFilterContext *ctx,
- AVFilterBufferRef **pbuf, int nb_samples, int flags)
-{
- AVFilterBufferRef *buf;
- AVFrame *frame;
- int ret;
-
- if (!pbuf)
- return ff_poll_frame(ctx->inputs[0]);
-
- frame = av_frame_alloc();
- if (!frame)
- return AVERROR(ENOMEM);
-
- if (!nb_samples)
- ret = av_buffersink_get_frame_flags(ctx, frame, flags);
- else
- ret = av_buffersink_get_samples(ctx, frame, nb_samples);
-
- if (ret < 0)
- goto fail;
-
- AV_NOWARN_DEPRECATED(
- if (ctx->inputs[0]->type == AVMEDIA_TYPE_VIDEO) {
- buf = avfilter_get_video_buffer_ref_from_arrays(frame->data, frame->linesize,
- AV_PERM_READ,
- frame->width, frame->height,
- frame->format);
- } else {
- buf = avfilter_get_audio_buffer_ref_from_arrays(frame->extended_data,
- frame->linesize[0], AV_PERM_READ,
- frame->nb_samples,
- frame->format,
- frame->channel_layout);
- }
- if (!buf) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
-
- avfilter_copy_frame_props(buf, frame);
- )
-
- buf->buf->priv = frame;
- buf->buf->free = compat_free_buffer;
-
- *pbuf = buf;
-
- return 0;
-fail:
- av_frame_free(&frame);
- return ret;
-}
-
-int attribute_align_arg av_buffersink_read(AVFilterContext *ctx, AVFilterBufferRef **buf)
-{
- return compat_read(ctx, buf, 0, 0);
-}
-
-int attribute_align_arg av_buffersink_read_samples(AVFilterContext *ctx, AVFilterBufferRef **buf,
- int nb_samples)
-{
- return compat_read(ctx, buf, nb_samples, 0);
-}
-
-int attribute_align_arg av_buffersink_get_buffer_ref(AVFilterContext *ctx,
- AVFilterBufferRef **bufref, int flags)
-{
- *bufref = NULL;
-
- av_assert0( !strcmp(ctx->filter->name, "buffersink")
- || !strcmp(ctx->filter->name, "abuffersink")
- || !strcmp(ctx->filter->name, "ffbuffersink")
- || !strcmp(ctx->filter->name, "ffabuffersink"));
-
- return compat_read(ctx, bufref, 0, flags);
-}
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-
AVRational av_buffersink_get_frame_rate(AVFilterContext *ctx)
{
av_assert0( !strcmp(ctx->filter->name, "buffersink")
return ctx->inputs[0]->frame_rate;
}
-int attribute_align_arg av_buffersink_poll_frame(AVFilterContext *ctx)
-{
- BufferSinkContext *buf = ctx->priv;
- AVFilterLink *inlink = ctx->inputs[0];
-
- av_assert0( !strcmp(ctx->filter->name, "buffersink")
- || !strcmp(ctx->filter->name, "abuffersink")
- || !strcmp(ctx->filter->name, "ffbuffersink")
- || !strcmp(ctx->filter->name, "ffabuffersink"));
-
- return av_fifo_size(buf->fifo)/sizeof(AVFilterBufferRef *) + ff_poll_frame(inlink);
-}
-
static av_cold int vsink_init(AVFilterContext *ctx, void *opaque)
{
BufferSinkContext *buf = ctx->priv;
AVFILTER_DEFINE_CLASS(buffersink);
AVFILTER_DEFINE_CLASS(abuffersink);
-#if FF_API_AVFILTERBUFFER
-
-#define ffbuffersink_options buffersink_options
-#define ffabuffersink_options abuffersink_options
-AVFILTER_DEFINE_CLASS(ffbuffersink);
-AVFILTER_DEFINE_CLASS(ffabuffersink);
-
-static const AVFilterPad ffbuffersink_inputs[] = {
- {
- .name = "default",
- .type = AVMEDIA_TYPE_VIDEO,
- .filter_frame = filter_frame,
- },
- { NULL },
-};
-
-AVFilter ff_vsink_ffbuffersink = {
- .name = "ffbuffersink",
- .description = NULL_IF_CONFIG_SMALL("Buffer video frames, and make them available to the end of the filter graph."),
- .priv_size = sizeof(BufferSinkContext),
- .priv_class = &ffbuffersink_class,
- .init_opaque = vsink_init,
- .uninit = uninit,
-
- .query_formats = vsink_query_formats,
- .inputs = ffbuffersink_inputs,
- .outputs = NULL,
-};
-
-static const AVFilterPad ffabuffersink_inputs[] = {
- {
- .name = "default",
- .type = AVMEDIA_TYPE_AUDIO,
- .filter_frame = filter_frame,
- },
- { NULL },
-};
-
-AVFilter ff_asink_ffabuffersink = {
- .name = "ffabuffersink",
- .description = NULL_IF_CONFIG_SMALL("Buffer audio frames, and make them available to the end of the filter graph."),
- .init_opaque = asink_init,
- .uninit = uninit,
- .priv_size = sizeof(BufferSinkContext),
- .priv_class = &ffabuffersink_class,
- .query_formats = asink_query_formats,
- .inputs = ffabuffersink_inputs,
- .outputs = NULL,
-};
-#endif /* FF_API_AVFILTERBUFFER */
-
static const AVFilterPad avfilter_vsink_buffer_inputs[] = {
{
.name = "default",
projects / ffmpeg / blobdiff