From 3cd342636fa245185fce7f4d6709a7a954f05ef8 Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Thu, 14 Mar 2013 19:52:59 +0100 Subject: [PATCH 1/4] lavfi/buffersrc: set channel layout if it is known. Introduced in 01649c7, lost in the API change. --- libavfilter/buffersrc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 54a58fe1e9..af66130255 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -134,6 +134,9 @@ static int attribute_align_arg av_buffersrc_add_frame_internal(AVFilterContext * frame->format); break; case AVMEDIA_TYPE_AUDIO: + /* For layouts unknown on input but known on link after negotiation. */ + if (!frame->channel_layout) + frame->channel_layout = s->channel_layout; CHECK_AUDIO_PARAM_CHANGE(ctx, s, frame->sample_rate, frame->channel_layout, frame->format); break; From f29c28a884c01ea63559fd6bc2250a6b5f78cbb0 Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Sat, 16 Mar 2013 17:45:22 +0100 Subject: [PATCH 2/4] lavfi/buffersrc: check channel count changes. --- libavfilter/buffersrc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index af66130255..3887d05e73 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -68,9 +68,9 @@ typedef struct { av_log(s, AV_LOG_INFO, "Changing frame properties on the fly is not supported by all filters.\n");\ } -#define CHECK_AUDIO_PARAM_CHANGE(s, c, srate, ch_layout, format)\ +#define CHECK_AUDIO_PARAM_CHANGE(s, c, srate, ch_layout, ch_count, format)\ if (c->sample_fmt != format || c->sample_rate != srate ||\ - c->channel_layout != ch_layout) {\ + c->channel_layout != ch_layout || c->channels != ch_count) {\ av_log(s, AV_LOG_ERROR, "Changing frame properties on the fly is not supported.\n");\ return AVERROR(EINVAL);\ } @@ -138,7 +138,7 @@ static int attribute_align_arg av_buffersrc_add_frame_internal(AVFilterContext * if (!frame->channel_layout) frame->channel_layout = s->channel_layout; CHECK_AUDIO_PARAM_CHANGE(ctx, s, frame->sample_rate, frame->channel_layout, - frame->format); + av_frame_get_channels(frame), frame->format); break; default: return AVERROR(EINVAL); From a5149607df825b65f1ea7bbbbff74e24bd07230e Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Sat, 16 Mar 2013 17:46:55 +0100 Subject: [PATCH 3/4] lavfi/buffersrc: disable deprecated warnings. --- libavfilter/buffersrc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 3887d05e73..99bcfae34b 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -172,13 +172,17 @@ static int attribute_align_arg av_buffersrc_add_frame_internal(AVFilterContext * static void compat_free_buffer(void *opaque, uint8_t *data) { AVFilterBufferRef *buf = opaque; + AV_NOWARN_DEPRECATED( avfilter_unref_buffer(buf); + ) } static void compat_unref_buffer(void *opaque, uint8_t *data) { AVBufferRef *buf = opaque; + AV_NOWARN_DEPRECATED( av_buffer_unref(&buf); + ) } int av_buffersrc_add_ref(AVFilterContext *ctx, AVFilterBufferRef *buf, @@ -206,8 +210,10 @@ int av_buffersrc_add_ref(AVFilterContext *ctx, AVFilterBufferRef *buf, goto fail; } + AV_NOWARN_DEPRECATED( if ((ret = avfilter_copy_buf_props(frame, buf)) < 0) goto fail; + ) #define WRAP_PLANE(ref_out, data, data_size) \ do { \ From 7e6c67dd24d767bfa71ec9cfefca5833535aaa84 Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Sat, 16 Mar 2013 17:57:04 +0100 Subject: [PATCH 4/4] lavfi/buffersink: fix header. Move non-obsolete functions, structures and constants outside the scope of "#if FF_API_AVFILTERBUFFER". Add attribute_deprecated to av_buffersink_get_buffer_ref() and av_buffersink_poll_frame(). Add doxygen for av_buffersink_get_frame_flags(). --- libavfilter/buffersink.h | 146 ++++++++++++++++++++------------------- 1 file changed, 74 insertions(+), 72 deletions(-) diff --git a/libavfilter/buffersink.h b/libavfilter/buffersink.h index eca3c23896..ce96d08b36 100644 --- a/libavfilter/buffersink.h +++ b/libavfilter/buffersink.h @@ -27,61 +27,6 @@ #include "avfilter.h" #if FF_API_AVFILTERBUFFER -/** - * Struct to use for initializing a buffersink context. - */ -typedef struct { - const enum AVPixelFormat *pixel_fmts; ///< list of allowed pixel formats, terminated by AV_PIX_FMT_NONE -} AVBufferSinkParams; - -/** - * Create an AVBufferSinkParams structure. - * - * Must be freed with av_free(). - */ -AVBufferSinkParams *av_buffersink_params_alloc(void); - -/** - * Struct to use for initializing an abuffersink context. - */ -typedef struct { - const enum AVSampleFormat *sample_fmts; ///< list of allowed sample formats, terminated by AV_SAMPLE_FMT_NONE - const int64_t *channel_layouts; ///< list of allowed channel layouts, terminated by -1 - const int *channel_counts; ///< list of allowed channel counts, terminated by -1 - int all_channel_counts; ///< if not 0, accept any channel count or layout - int *sample_rates; ///< list of allowed sample rates, terminated by -1 -} AVABufferSinkParams; - -/** - * Create an AVABufferSinkParams structure. - * - * Must be freed with av_free(). - */ -AVABufferSinkParams *av_abuffersink_params_alloc(void); - -/** - * Set the frame size for an audio buffer sink. - * - * All calls to av_buffersink_get_buffer_ref will return a buffer with - * exactly the specified number of samples, or AVERROR(EAGAIN) if there is - * not enough. The last buffer at EOF will be padded with 0. - */ -void av_buffersink_set_frame_size(AVFilterContext *ctx, unsigned frame_size); - -/** - * Tell av_buffersink_get_buffer_ref() to read video/samples buffer - * reference, but not remove it from the buffer. This is useful if you - * need only to read a video/samples buffer, without to fetch it. - */ -#define AV_BUFFERSINK_FLAG_PEEK 1 - -/** - * Tell av_buffersink_get_buffer_ref() not to request a frame from its input. - * If a frame is already buffered, it is read (and removed from the buffer), - * but if no frame is present, return AVERROR(EAGAIN). - */ -#define AV_BUFFERSINK_FLAG_NO_REQUEST 2 - /** * Get an audio/video buffer data from buffer_sink and put it in bufref. * @@ -92,27 +37,16 @@ void av_buffersink_set_frame_size(AVFilterContext *ctx, unsigned frame_size); * @return >= 0 in case of success, a negative AVERROR code in case of * failure */ +attribute_deprecated int av_buffersink_get_buffer_ref(AVFilterContext *buffer_sink, AVFilterBufferRef **bufref, int flags); -/* TODO */ -int av_buffersink_get_frame_flags(AVFilterContext *ctx, AVFrame *frame, int flags); - /** * Get the number of immediately available frames. */ +attribute_deprecated int av_buffersink_poll_frame(AVFilterContext *ctx); -/** - * Get the frame rate of the input. - */ -AVRational av_buffersink_get_frame_rate(AVFilterContext *ctx); - -/** - * @defgroup libav_api Libav API - * @{ - */ - /** * Get a buffer with filtered data from sink and put it in buf. * @@ -149,6 +83,78 @@ int av_buffersink_read_samples(AVFilterContext *ctx, AVFilterBufferRef **buf, int nb_samples); #endif +/** + * Get a frame with filtered data from sink and put it in frame. + * + * @param ctx pointer to a buffersink or abuffersink filter context. + * @param frame pointer to an allocated frame that will be filled with data. + * The data must be freed using av_frame_unref() / av_frame_free() + * @param flags a combination of AV_BUFFERSINK_FLAG_* flags + * + * @return >= 0 in for success, a negative AVERROR code for failure. + */ +int av_buffersink_get_frame_flags(AVFilterContext *ctx, AVFrame *frame, int flags); + +/** + * Tell av_buffersink_get_buffer_ref() to read video/samples buffer + * reference, but not remove it from the buffer. This is useful if you + * need only to read a video/samples buffer, without to fetch it. + */ +#define AV_BUFFERSINK_FLAG_PEEK 1 + +/** + * Tell av_buffersink_get_buffer_ref() not to request a frame from its input. + * If a frame is already buffered, it is read (and removed from the buffer), + * but if no frame is present, return AVERROR(EAGAIN). + */ +#define AV_BUFFERSINK_FLAG_NO_REQUEST 2 + +/** + * Struct to use for initializing a buffersink context. + */ +typedef struct { + const enum AVPixelFormat *pixel_fmts; ///< list of allowed pixel formats, terminated by AV_PIX_FMT_NONE +} AVBufferSinkParams; + +/** + * Create an AVBufferSinkParams structure. + * + * Must be freed with av_free(). + */ +AVBufferSinkParams *av_buffersink_params_alloc(void); + +/** + * Struct to use for initializing an abuffersink context. + */ +typedef struct { + const enum AVSampleFormat *sample_fmts; ///< list of allowed sample formats, terminated by AV_SAMPLE_FMT_NONE + const int64_t *channel_layouts; ///< list of allowed channel layouts, terminated by -1 + const int *channel_counts; ///< list of allowed channel counts, terminated by -1 + int all_channel_counts; ///< if not 0, accept any channel count or layout + int *sample_rates; ///< list of allowed sample rates, terminated by -1 +} AVABufferSinkParams; + +/** + * Create an AVABufferSinkParams structure. + * + * Must be freed with av_free(). + */ +AVABufferSinkParams *av_abuffersink_params_alloc(void); + +/** + * Set the frame size for an audio buffer sink. + * + * All calls to av_buffersink_get_buffer_ref will return a buffer with + * exactly the specified number of samples, or AVERROR(EAGAIN) if there is + * not enough. The last buffer at EOF will be padded with 0. + */ +void av_buffersink_set_frame_size(AVFilterContext *ctx, unsigned frame_size); + +/** + * Get the frame rate of the input. + */ +AVRational av_buffersink_get_frame_rate(AVFilterContext *ctx); + /** * Get a frame with filtered data from sink and put it in frame. * @@ -177,8 +183,4 @@ int av_buffersink_get_frame(AVFilterContext *ctx, AVFrame *frame); */ int av_buffersink_get_samples(AVFilterContext *ctx, AVFrame *frame, int nb_samples); -/** - * @} - */ - #endif /* AVFILTER_BUFFERSINK_H */