mirror of https://git.ffmpeg.org/ffmpeg.git
Merge remote-tracking branch 'cigaes/master'
* cigaes/master: lavfi/buffersink: fix header. lavfi/buffersrc: disable deprecated warnings. lavfi/buffersrc: check channel count changes. lavfi/buffersrc: set channel layout if it is known. Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
975fbd43ad
|
@ -27,6 +27,88 @@
|
||||||
#include "avfilter.h"
|
#include "avfilter.h"
|
||||||
|
|
||||||
#if FF_API_AVFILTERBUFFER
|
#if FF_API_AVFILTERBUFFER
|
||||||
|
/**
|
||||||
|
* Get an audio/video buffer data from buffer_sink and put it in bufref.
|
||||||
|
*
|
||||||
|
* This function works with both audio and video buffer sinks.
|
||||||
|
*
|
||||||
|
* @param buffer_sink pointer to a buffersink or abuffersink context
|
||||||
|
* @param flags a combination of AV_BUFFERSINK_FLAG_* flags
|
||||||
|
* @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);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the number of immediately available frames.
|
||||||
|
*/
|
||||||
|
attribute_deprecated
|
||||||
|
int av_buffersink_poll_frame(AVFilterContext *ctx);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get a buffer with filtered data from sink and put it in buf.
|
||||||
|
*
|
||||||
|
* @param ctx pointer to a context of a buffersink or abuffersink AVFilter.
|
||||||
|
* @param buf pointer to the buffer will be written here if buf is non-NULL. buf
|
||||||
|
* must be freed by the caller using avfilter_unref_buffer().
|
||||||
|
* Buf may also be NULL to query whether a buffer is ready to be
|
||||||
|
* output.
|
||||||
|
*
|
||||||
|
* @return >= 0 in case of success, a negative AVERROR code in case of
|
||||||
|
* failure.
|
||||||
|
*/
|
||||||
|
attribute_deprecated
|
||||||
|
int av_buffersink_read(AVFilterContext *ctx, AVFilterBufferRef **buf);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Same as av_buffersink_read, but with the ability to specify the number of
|
||||||
|
* samples read. This function is less efficient than av_buffersink_read(),
|
||||||
|
* because it copies the data around.
|
||||||
|
*
|
||||||
|
* @param ctx pointer to a context of the abuffersink AVFilter.
|
||||||
|
* @param buf pointer to the buffer will be written here if buf is non-NULL. buf
|
||||||
|
* must be freed by the caller using avfilter_unref_buffer(). buf
|
||||||
|
* will contain exactly nb_samples audio samples, except at the end
|
||||||
|
* of stream, when it can contain less than nb_samples.
|
||||||
|
* Buf may also be NULL to query whether a buffer is ready to be
|
||||||
|
* output.
|
||||||
|
*
|
||||||
|
* @warning do not mix this function with av_buffersink_read(). Use only one or
|
||||||
|
* the other with a single sink, not both.
|
||||||
|
*/
|
||||||
|
attribute_deprecated
|
||||||
|
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.
|
* Struct to use for initializing a buffersink context.
|
||||||
*/
|
*/
|
||||||
|
@ -68,87 +150,11 @@ AVABufferSinkParams *av_abuffersink_params_alloc(void);
|
||||||
*/
|
*/
|
||||||
void av_buffersink_set_frame_size(AVFilterContext *ctx, unsigned frame_size);
|
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.
|
|
||||||
*
|
|
||||||
* This function works with both audio and video buffer sinks.
|
|
||||||
*
|
|
||||||
* @param buffer_sink pointer to a buffersink or abuffersink context
|
|
||||||
* @param flags a combination of AV_BUFFERSINK_FLAG_* flags
|
|
||||||
* @return >= 0 in case of success, a negative AVERROR code in case of
|
|
||||||
* failure
|
|
||||||
*/
|
|
||||||
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.
|
|
||||||
*/
|
|
||||||
int av_buffersink_poll_frame(AVFilterContext *ctx);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the frame rate of the input.
|
* Get the frame rate of the input.
|
||||||
*/
|
*/
|
||||||
AVRational av_buffersink_get_frame_rate(AVFilterContext *ctx);
|
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.
|
|
||||||
*
|
|
||||||
* @param ctx pointer to a context of a buffersink or abuffersink AVFilter.
|
|
||||||
* @param buf pointer to the buffer will be written here if buf is non-NULL. buf
|
|
||||||
* must be freed by the caller using avfilter_unref_buffer().
|
|
||||||
* Buf may also be NULL to query whether a buffer is ready to be
|
|
||||||
* output.
|
|
||||||
*
|
|
||||||
* @return >= 0 in case of success, a negative AVERROR code in case of
|
|
||||||
* failure.
|
|
||||||
*/
|
|
||||||
attribute_deprecated
|
|
||||||
int av_buffersink_read(AVFilterContext *ctx, AVFilterBufferRef **buf);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Same as av_buffersink_read, but with the ability to specify the number of
|
|
||||||
* samples read. This function is less efficient than av_buffersink_read(),
|
|
||||||
* because it copies the data around.
|
|
||||||
*
|
|
||||||
* @param ctx pointer to a context of the abuffersink AVFilter.
|
|
||||||
* @param buf pointer to the buffer will be written here if buf is non-NULL. buf
|
|
||||||
* must be freed by the caller using avfilter_unref_buffer(). buf
|
|
||||||
* will contain exactly nb_samples audio samples, except at the end
|
|
||||||
* of stream, when it can contain less than nb_samples.
|
|
||||||
* Buf may also be NULL to query whether a buffer is ready to be
|
|
||||||
* output.
|
|
||||||
*
|
|
||||||
* @warning do not mix this function with av_buffersink_read(). Use only one or
|
|
||||||
* the other with a single sink, not both.
|
|
||||||
*/
|
|
||||||
attribute_deprecated
|
|
||||||
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.
|
* 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);
|
int av_buffersink_get_samples(AVFilterContext *ctx, AVFrame *frame, int nb_samples);
|
||||||
|
|
||||||
/**
|
|
||||||
* @}
|
|
||||||
*/
|
|
||||||
|
|
||||||
#endif /* AVFILTER_BUFFERSINK_H */
|
#endif /* AVFILTER_BUFFERSINK_H */
|
||||||
|
|
|
@ -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");\
|
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 ||\
|
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");\
|
av_log(s, AV_LOG_ERROR, "Changing frame properties on the fly is not supported.\n");\
|
||||||
return AVERROR(EINVAL);\
|
return AVERROR(EINVAL);\
|
||||||
}
|
}
|
||||||
|
@ -134,8 +134,11 @@ static int attribute_align_arg av_buffersrc_add_frame_internal(AVFilterContext *
|
||||||
frame->format);
|
frame->format);
|
||||||
break;
|
break;
|
||||||
case AVMEDIA_TYPE_AUDIO:
|
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,
|
CHECK_AUDIO_PARAM_CHANGE(ctx, s, frame->sample_rate, frame->channel_layout,
|
||||||
frame->format);
|
av_frame_get_channels(frame), frame->format);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return AVERROR(EINVAL);
|
return AVERROR(EINVAL);
|
||||||
|
@ -169,13 +172,17 @@ static int attribute_align_arg av_buffersrc_add_frame_internal(AVFilterContext *
|
||||||
static void compat_free_buffer(void *opaque, uint8_t *data)
|
static void compat_free_buffer(void *opaque, uint8_t *data)
|
||||||
{
|
{
|
||||||
AVFilterBufferRef *buf = opaque;
|
AVFilterBufferRef *buf = opaque;
|
||||||
|
AV_NOWARN_DEPRECATED(
|
||||||
avfilter_unref_buffer(buf);
|
avfilter_unref_buffer(buf);
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void compat_unref_buffer(void *opaque, uint8_t *data)
|
static void compat_unref_buffer(void *opaque, uint8_t *data)
|
||||||
{
|
{
|
||||||
AVBufferRef *buf = opaque;
|
AVBufferRef *buf = opaque;
|
||||||
|
AV_NOWARN_DEPRECATED(
|
||||||
av_buffer_unref(&buf);
|
av_buffer_unref(&buf);
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
int av_buffersrc_add_ref(AVFilterContext *ctx, AVFilterBufferRef *buf,
|
int av_buffersrc_add_ref(AVFilterContext *ctx, AVFilterBufferRef *buf,
|
||||||
|
@ -203,8 +210,10 @@ int av_buffersrc_add_ref(AVFilterContext *ctx, AVFilterBufferRef *buf,
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
AV_NOWARN_DEPRECATED(
|
||||||
if ((ret = avfilter_copy_buf_props(frame, buf)) < 0)
|
if ((ret = avfilter_copy_buf_props(frame, buf)) < 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
)
|
||||||
|
|
||||||
#define WRAP_PLANE(ref_out, data, data_size) \
|
#define WRAP_PLANE(ref_out, data, data_size) \
|
||||||
do { \
|
do { \
|
||||||
|
|
Loading…
Reference in New Issue