diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 16:22:03 +0200 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 16:22:03 +0200 |
commit | 033764e015e33b9ce9583317092337367b3fea2b (patch) | |
tree | 50184fa2019695d048931943373bce81bbd41ac5 /libavfilter/buffersink.c | |
parent | 43e2e172dfbd734947c30bdbfa8f19b7ca95576d (diff) | |
parent | f6974fe651d29ef6eb68d66d73f7b6c011062aa0 (diff) |
Merge commit 'f6974fe651d29ef6eb68d66d73f7b6c011062aa0'
* commit 'f6974fe651d29ef6eb68d66d73f7b6c011062aa0':
lavfi: Drop deprecated AVFilterBuffer* code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavfilter/buffersink.c')
-rw-r--r-- | libavfilter/buffersink.c | 157 |
1 files changed, 0 insertions, 157 deletions
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index 8d2e7d73d5..de48b3d579 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -266,95 +266,6 @@ void av_buffersink_set_frame_size(AVFilterContext *ctx, unsigned frame_size) 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") @@ -363,23 +274,6 @@ AVRational av_buffersink_get_frame_rate(AVFilterContext *ctx) return ctx->inputs[0]->frame_rate; } -#if FF_API_AVFILTERBUFFER -FF_DISABLE_DEPRECATION_WARNINGS -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)/FIFO_INIT_ELEMENT_SIZE + ff_poll_frame(inlink); -} -FF_ENABLE_DEPRECATION_WARNINGS -#endif - static av_cold int vsink_init(AVFilterContext *ctx, void *opaque) { BufferSinkContext *buf = ctx->priv; @@ -518,57 +412,6 @@ static const AVOption abuffersink_options[] = { 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", |