diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-08-30 23:22:29 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-05-09 20:29:53 +0200 |
| commit | 7ef0adcc2e800cb1357d4d5d7ce878c0f9a36c01 (patch) | |
| tree | 3919a6f8dfd07ea511af7b0142f291580881b252 /libavfilter/avfilter.h | |
| parent | 6735534f19369a914d795aa84cd3faa4c57729ce (diff) | |
| download | ffmpeg-7ef0adcc2e800cb1357d4d5d7ce878c0f9a36c01.tar.gz | |
lavfi: simplify signature for avfilter_get_audio_buffer() and friends
The additional parameters are just complicating the function interface.
Assume that a requested samples buffer will *always* have the format
specified in the requested link.
This breaks audio filtering API and ABI in theory, but since it's
unusable right now this shouldn't be a problem.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavfilter/avfilter.h')
| -rw-r--r-- | libavfilter/avfilter.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 19ac057ed4..cf95b4bb16 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -387,8 +387,7 @@ struct AVFilterPad { * Input audio pads only. */ AVFilterBufferRef *(*get_audio_buffer)(AVFilterLink *link, int perms, - enum AVSampleFormat sample_fmt, int nb_samples, - uint64_t channel_layout); + int nb_samples); /** * Callback called after the slices of a frame are completely sent. If @@ -473,9 +472,7 @@ AVFilterBufferRef *avfilter_default_get_video_buffer(AVFilterLink *link, /** default handler for get_audio_buffer() for audio inputs */ AVFilterBufferRef *avfilter_default_get_audio_buffer(AVFilterLink *link, int perms, - enum AVSampleFormat sample_fmt, - int nb_samples, - uint64_t channel_layout); + int nb_samples); /** * A helper for query_formats() which sets all links to the same list of @@ -505,8 +502,7 @@ AVFilterBufferRef *avfilter_null_get_video_buffer(AVFilterLink *link, /** get_audio_buffer() handler for filters which simply pass audio along */ AVFilterBufferRef *avfilter_null_get_audio_buffer(AVFilterLink *link, int perms, - enum AVSampleFormat sample_fmt, int nb_samples, - uint64_t channel_layout); + int nb_samples); /** * Filter definition. This defines the pads a filter contains, and all the @@ -689,16 +685,12 @@ avfilter_get_video_buffer_ref_from_arrays(uint8_t *data[4], int linesize[4], int * @param link the output link to the filter from which the buffer will * be requested * @param perms the required access permissions - * @param sample_fmt the format of each sample in the buffer to allocate * @param nb_samples the number of samples per channel - * @param channel_layout the number and type of channels per sample in the buffer to allocate - * @param planar audio data layout - planar or packed * @return A reference to the samples. This must be unreferenced with * avfilter_unref_buffer when you are finished with it. */ AVFilterBufferRef *avfilter_get_audio_buffer(AVFilterLink *link, int perms, - enum AVSampleFormat sample_fmt, int nb_samples, - uint64_t channel_layout); + int nb_samples); /** * Create an audio buffer reference wrapped around an already |