diff options
Diffstat (limited to 'ffmpeg/libavfilter/buffersink.c')
| -rw-r--r-- | ffmpeg/libavfilter/buffersink.c | 257 |
1 files changed, 154 insertions, 103 deletions
diff --git a/ffmpeg/libavfilter/buffersink.c b/ffmpeg/libavfilter/buffersink.c index bcb6525..a6b24ad 100644 --- a/ffmpeg/libavfilter/buffersink.c +++ b/ffmpeg/libavfilter/buffersink.c @@ -27,7 +27,9 @@ #include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" +#include "libavutil/internal.h" #include "libavutil/mathematics.h" +#include "libavutil/opt.h" #include "audio.h" #include "avfilter.h" @@ -35,23 +37,32 @@ #include "internal.h" typedef struct { + const AVClass *class; AVFifoBuffer *fifo; ///< FIFO buffer of video frame references unsigned warning_limit; /* only used for video */ enum AVPixelFormat *pixel_fmts; ///< list of accepted pixel formats, must be terminated with -1 + int pixel_fmts_size; /* only used for audio */ enum AVSampleFormat *sample_fmts; ///< list of accepted sample formats, terminated by AV_SAMPLE_FMT_NONE + int sample_fmts_size; int64_t *channel_layouts; ///< list of accepted channel layouts, terminated by -1 + int channel_layouts_size; + int *channel_counts; ///< list of accepted channel counts, terminated by -1 + int channel_counts_size; int all_channel_counts; int *sample_rates; ///< list of accepted sample rates, terminated by -1 + int sample_rates_size; /* only used for compat API */ - AVAudioFifo *audio_fifo; ///< FIFO for audio samples + AVAudioFifo *audio_fifo; ///< FIFO for audio samples int64_t next_pts; ///< interpolating audio pts } BufferSinkContext; +#define NB_ITEMS(list) (list ## _size / sizeof(*list)) + static av_cold void uninit(AVFilterContext *ctx) { BufferSinkContext *sink = ctx->priv; @@ -63,15 +74,11 @@ static av_cold void uninit(AVFilterContext *ctx) if (sink->fifo) { while (av_fifo_size(sink->fifo) >= sizeof(AVFilterBufferRef *)) { av_fifo_generic_read(sink->fifo, &frame, sizeof(frame), NULL); - av_frame_unref(frame); + av_frame_free(&frame); } av_fifo_free(sink->fifo); sink->fifo = NULL; } - av_freep(&sink->pixel_fmts); - av_freep(&sink->sample_fmts); - av_freep(&sink->sample_rates); - av_freep(&sink->channel_layouts); } static int add_buffer_ref(AVFilterContext *ctx, AVFrame *ref) @@ -112,7 +119,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame) return 0; } -int av_buffersink_get_frame(AVFilterContext *ctx, AVFrame *frame) +int attribute_align_arg av_buffersink_get_frame(AVFilterContext *ctx, AVFrame *frame) { return av_buffersink_get_frame_flags(ctx, frame, 0); } @@ -160,17 +167,18 @@ static int read_from_fifo(AVFilterContext *ctx, AVFrame *frame, av_audio_fifo_read(s->audio_fifo, (void**)tmp->extended_data, nb_samples); tmp->pts = s->next_pts; - s->next_pts += av_rescale_q(nb_samples, (AVRational){1, link->sample_rate}, - link->time_base); + if (s->next_pts != AV_NOPTS_VALUE) + s->next_pts += av_rescale_q(nb_samples, (AVRational){1, link->sample_rate}, + link->time_base); av_frame_move_ref(frame, tmp); av_frame_free(&tmp); return 0; - } -int attribute_align_arg av_buffersink_get_samples(AVFilterContext *ctx, AVFrame *frame, int nb_samples) +int attribute_align_arg av_buffersink_get_samples(AVFilterContext *ctx, + AVFrame *frame, int nb_samples) { BufferSinkContext *s = ctx->priv; AVFilterLink *link = ctx->inputs[0]; @@ -211,7 +219,6 @@ int attribute_align_arg av_buffersink_get_samples(AVFilterContext *ctx, AVFrame } return ret; - } AVBufferSinkParams *av_buffersink_params_alloc(void) @@ -246,6 +253,7 @@ static av_cold int common_init(AVFilterContext *ctx) return AVERROR(ENOMEM); } buf->warning_limit = 100; + buf->next_pts = AV_NOPTS_VALUE; return 0; } @@ -258,6 +266,7 @@ void av_buffersink_set_frame_size(AVFilterContext *ctx, unsigned frame_size) } #if FF_API_AVFILTERBUFFER +FF_DISABLE_DEPRECATION_WARNINGS static void compat_free_buffer(AVFilterBuffer *buf) { AVFrame *frame = buf->priv; @@ -265,7 +274,8 @@ static void compat_free_buffer(AVFilterBuffer *buf) av_free(buf); } -static int attribute_align_arg compat_read(AVFilterContext *ctx, AVFilterBufferRef **pbuf, int nb_samples, int flags) +static int compat_read(AVFilterContext *ctx, + AVFilterBufferRef **pbuf, int nb_samples, int flags) { AVFilterBufferRef *buf; AVFrame *frame; @@ -286,6 +296,7 @@ static int attribute_align_arg compat_read(AVFilterContext *ctx, AVFilterBufferR 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, @@ -304,6 +315,7 @@ static int attribute_align_arg compat_read(AVFilterContext *ctx, AVFilterBufferR } avfilter_copy_frame_props(buf, frame); + ) buf->buf->priv = frame; buf->buf->free = compat_free_buffer; @@ -316,19 +328,19 @@ fail: return ret; } -int av_buffersink_read(AVFilterContext *ctx, AVFilterBufferRef **buf) +int attribute_align_arg av_buffersink_read(AVFilterContext *ctx, AVFilterBufferRef **buf) { return compat_read(ctx, buf, 0, 0); } -int av_buffersink_read_samples(AVFilterContext *ctx, AVFilterBufferRef **buf, - int nb_samples) +int attribute_align_arg av_buffersink_read_samples(AVFilterContext *ctx, AVFilterBufferRef **buf, + int nb_samples) { return compat_read(ctx, buf, nb_samples, 0); } -int av_buffersink_get_buffer_ref(AVFilterContext *ctx, - AVFilterBufferRef **bufref, int flags) +int attribute_align_arg av_buffersink_get_buffer_ref(AVFilterContext *ctx, + AVFilterBufferRef **bufref, int flags) { *bufref = NULL; @@ -339,6 +351,7 @@ int av_buffersink_get_buffer_ref(AVFilterContext *ctx, return compat_read(ctx, bufref, 0, flags); } +FF_ENABLE_DEPRECATION_WARNINGS #endif AVRational av_buffersink_get_frame_rate(AVFilterContext *ctx) @@ -362,83 +375,63 @@ int attribute_align_arg av_buffersink_poll_frame(AVFilterContext *ctx) return av_fifo_size(buf->fifo)/sizeof(AVFilterBufferRef *) + ff_poll_frame(inlink); } -static av_cold int vsink_init(AVFilterContext *ctx, const char *args, void *opaque) +static av_cold int vsink_init(AVFilterContext *ctx, void *opaque) { BufferSinkContext *buf = ctx->priv; AVBufferSinkParams *params = opaque; + int ret; - if (params && params->pixel_fmts) { - const int *pixel_fmts = params->pixel_fmts; - - buf->pixel_fmts = ff_copy_int_list(pixel_fmts); - if (!buf->pixel_fmts) - return AVERROR(ENOMEM); + if (params) { + if ((ret = av_opt_set_int_list(buf, "pix_fmts", params->pixel_fmts, AV_PIX_FMT_NONE, 0)) < 0) + return ret; } return common_init(ctx); } +#define CHECK_LIST_SIZE(field) \ + if (buf->field ## _size % sizeof(*buf->field)) { \ + av_log(ctx, AV_LOG_ERROR, "Invalid size for " #field ": %d, " \ + "should be multiple of %d\n", \ + buf->field ## _size, (int)sizeof(*buf->field)); \ + return AVERROR(EINVAL); \ + } static int vsink_query_formats(AVFilterContext *ctx) { BufferSinkContext *buf = ctx->priv; + AVFilterFormats *formats = NULL; + unsigned i; + int ret; - if (buf->pixel_fmts) - ff_set_common_formats(ctx, ff_make_format_list(buf->pixel_fmts)); - else + CHECK_LIST_SIZE(pixel_fmts) + if (buf->pixel_fmts_size) { + for (i = 0; i < NB_ITEMS(buf->pixel_fmts); i++) + if ((ret = ff_add_format(&formats, buf->pixel_fmts[i])) < 0) { + ff_formats_unref(&formats); + return ret; + } + ff_set_common_formats(ctx, formats); + } else { ff_default_query_formats(ctx); + } return 0; } -static int64_t *concat_channels_lists(const int64_t *layouts, const int *counts) -{ - int nb_layouts = 0, nb_counts = 0, i; - int64_t *list; - - if (layouts) - for (; layouts[nb_layouts] != -1; nb_layouts++); - if (counts) - for (; counts[nb_counts] != -1; nb_counts++); - if (nb_counts > INT_MAX - 1 - nb_layouts) - return NULL; - if (!(list = av_calloc(nb_layouts + nb_counts + 1, sizeof(*list)))) - return NULL; - for (i = 0; i < nb_layouts; i++) - list[i] = layouts[i]; - for (i = 0; i < nb_counts; i++) - list[nb_layouts + i] = FF_COUNT2LAYOUT(counts[i]); - list[nb_layouts + nb_counts] = -1; - return list; -} - -static av_cold int asink_init(AVFilterContext *ctx, const char *args, void *opaque) +static av_cold int asink_init(AVFilterContext *ctx, void *opaque) { BufferSinkContext *buf = ctx->priv; AVABufferSinkParams *params = opaque; + int ret; - if (params && params->sample_fmts) { - buf->sample_fmts = ff_copy_int_list(params->sample_fmts); - if (!buf->sample_fmts) - return AVERROR(ENOMEM); - } - if (params && params->sample_rates) { - buf->sample_rates = ff_copy_int_list(params->sample_rates); - if (!buf->sample_rates) - return AVERROR(ENOMEM); - } - if (params && (params->channel_layouts || params->channel_counts)) { - if (params->all_channel_counts) { - av_log(ctx, AV_LOG_ERROR, - "Conflicting all_channel_counts and list in parameters\n"); - return AVERROR(EINVAL); - } - buf->channel_layouts = concat_channels_lists(params->channel_layouts, - params->channel_counts); - if (!buf->channel_layouts) - return AVERROR(ENOMEM); + if (params) { + if ((ret = av_opt_set_int_list(buf, "sample_fmts", params->sample_fmts, AV_SAMPLE_FMT_NONE, 0)) < 0 || + (ret = av_opt_set_int_list(buf, "sample_rates", params->sample_rates, -1, 0)) < 0 || + (ret = av_opt_set_int_list(buf, "channel_layouts", params->channel_layouts, -1, 0)) < 0 || + (ret = av_opt_set_int_list(buf, "channel_counts", params->channel_counts, -1, 0)) < 0 || + (ret = av_opt_set_int(buf, "all_channel_counts", params->all_channel_counts, 0)) < 0) + return ret; } - if (params) - buf->all_channel_counts = params->all_channel_counts; return common_init(ctx); } @@ -447,32 +440,86 @@ static int asink_query_formats(AVFilterContext *ctx) BufferSinkContext *buf = ctx->priv; AVFilterFormats *formats = NULL; AVFilterChannelLayouts *layouts = NULL; + unsigned i; + int ret; - if (buf->sample_fmts) { - if (!(formats = ff_make_format_list(buf->sample_fmts))) - return AVERROR(ENOMEM); + CHECK_LIST_SIZE(sample_fmts) + CHECK_LIST_SIZE(sample_rates) + CHECK_LIST_SIZE(channel_layouts) + CHECK_LIST_SIZE(channel_counts) + + if (buf->sample_fmts_size) { + for (i = 0; i < NB_ITEMS(buf->sample_fmts); i++) + if ((ret = ff_add_format(&formats, buf->sample_fmts[i])) < 0) { + ff_formats_unref(&formats); + return ret; + } ff_set_common_formats(ctx, formats); } - if (buf->channel_layouts || buf->all_channel_counts) { - layouts = buf->all_channel_counts ? ff_all_channel_counts() : - avfilter_make_format64_list(buf->channel_layouts); - if (!layouts) - return AVERROR(ENOMEM); + if (buf->channel_layouts_size || buf->channel_counts_size || + buf->all_channel_counts) { + for (i = 0; i < NB_ITEMS(buf->channel_layouts); i++) + if ((ret = ff_add_channel_layout(&layouts, buf->channel_layouts[i])) < 0) { + ff_channel_layouts_unref(&layouts); + return ret; + } + for (i = 0; i < NB_ITEMS(buf->channel_counts); i++) + if ((ret = ff_add_channel_layout(&layouts, FF_COUNT2LAYOUT(buf->channel_counts[i]))) < 0) { + ff_channel_layouts_unref(&layouts); + return ret; + } + if (buf->all_channel_counts) { + if (layouts) + av_log(ctx, AV_LOG_WARNING, + "Conflicting all_channel_counts and list in options\n"); + else if (!(layouts = ff_all_channel_counts())) + return AVERROR(ENOMEM); + } ff_set_common_channel_layouts(ctx, layouts); } - if (buf->sample_rates) { - formats = ff_make_format_list(buf->sample_rates); - if (!formats) - return AVERROR(ENOMEM); + if (buf->sample_rates_size) { + formats = NULL; + for (i = 0; i < NB_ITEMS(buf->sample_rates); i++) + if ((ret = ff_add_format(&formats, buf->sample_rates[i])) < 0) { + ff_formats_unref(&formats); + return ret; + } ff_set_common_samplerates(ctx, formats); } 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[] = { + { "pix_fmts", "set the supported pixel formats", OFFSET(pixel_fmts), AV_OPT_TYPE_BINARY, .flags = FLAGS }, + { NULL }, +}; +#undef FLAGS +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM +static const AVOption abuffersink_options[] = { + { "sample_fmts", "set the supported sample formats", OFFSET(sample_fmts), AV_OPT_TYPE_BINARY, .flags = FLAGS }, + { "sample_rates", "set the supported sample rates", OFFSET(sample_rates), AV_OPT_TYPE_BINARY, .flags = FLAGS }, + { "channel_layouts", "set the supported channel layouts", OFFSET(channel_layouts), AV_OPT_TYPE_BINARY, .flags = FLAGS }, + { "channel_counts", "set the supported channel counts", OFFSET(channel_counts), AV_OPT_TYPE_BINARY, .flags = FLAGS }, + { "all_channel_counts", "accept all channel counts", OFFSET(all_channel_counts), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, FLAGS }, + { NULL }, +}; +#undef FLAGS + +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", @@ -482,10 +529,11 @@ static const AVFilterPad ffbuffersink_inputs[] = { { NULL }, }; -AVFilter avfilter_vsink_ffbuffersink = { +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, @@ -503,12 +551,13 @@ static const AVFilterPad ffabuffersink_inputs[] = { { NULL }, }; -AVFilter avfilter_asink_ffabuffersink = { +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, @@ -517,42 +566,44 @@ AVFilter avfilter_asink_ffabuffersink = { static const AVFilterPad avfilter_vsink_buffer_inputs[] = { { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, .filter_frame = filter_frame, }, { NULL } }; -AVFilter avfilter_vsink_buffer = { - .name = "buffersink", +AVFilter ff_vsink_buffer = { + .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), + .priv_size = sizeof(BufferSinkContext), + .priv_class = &buffersink_class, .init_opaque = vsink_init, - .uninit = uninit, + .uninit = uninit, .query_formats = vsink_query_formats, - .inputs = avfilter_vsink_buffer_inputs, - .outputs = NULL, + .inputs = avfilter_vsink_buffer_inputs, + .outputs = NULL, }; static const AVFilterPad avfilter_asink_abuffer_inputs[] = { { - .name = "default", - .type = AVMEDIA_TYPE_AUDIO, - .filter_frame = filter_frame, + .name = "default", + .type = AVMEDIA_TYPE_AUDIO, + .filter_frame = filter_frame, }, { NULL } }; -AVFilter avfilter_asink_abuffer = { - .name = "abuffersink", +AVFilter ff_asink_abuffer = { + .name = "abuffersink", .description = NULL_IF_CONFIG_SMALL("Buffer audio frames, and make them available to the end of the filter graph."), - .priv_size = sizeof(BufferSinkContext), + .priv_class = &abuffersink_class, + .priv_size = sizeof(BufferSinkContext), .init_opaque = asink_init, - .uninit = uninit, + .uninit = uninit, .query_formats = asink_query_formats, - .inputs = avfilter_asink_abuffer_inputs, - .outputs = NULL, + .inputs = avfilter_asink_abuffer_inputs, + .outputs = NULL, }; |