From e7ba5b1de063e9b1de441b0d1c5708857f739fa5 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Fri, 5 Oct 2012 06:56:00 +0200 Subject: lavr: change the type of the data buffers to uint8_t**. This is more consistent with what the rest of Libav does. This breaks API. --- libavresample/audio_data.c | 2 +- libavresample/audio_data.h | 2 +- libavresample/avresample-test.c | 4 ++-- libavresample/avresample.h | 6 +++--- libavresample/utils.c | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'libavresample') diff --git a/libavresample/audio_data.c b/libavresample/audio_data.c index d624ad3796..199a68cb11 100644 --- a/libavresample/audio_data.c +++ b/libavresample/audio_data.c @@ -62,7 +62,7 @@ int ff_audio_data_set_channels(AudioData *a, int channels) return 0; } -int ff_audio_data_init(AudioData *a, void **src, int plane_size, int channels, +int ff_audio_data_init(AudioData *a, uint8_t **src, int plane_size, int channels, int nb_samples, enum AVSampleFormat sample_fmt, int read_only, const char *name) { diff --git a/libavresample/audio_data.h b/libavresample/audio_data.h index 4609ebc284..558e7e67ec 100644 --- a/libavresample/audio_data.h +++ b/libavresample/audio_data.h @@ -73,7 +73,7 @@ int ff_audio_data_set_channels(AudioData *a, int channels); * @param name name for debug logging (can be NULL) * @return 0 on success, negative AVERROR value on error */ -int ff_audio_data_init(AudioData *a, void **src, int plane_size, int channels, +int ff_audio_data_init(AudioData *a, uint8_t **src, int plane_size, int channels, int nb_samples, enum AVSampleFormat sample_fmt, int read_only, const char *name); diff --git a/libavresample/avresample-test.c b/libavresample/avresample-test.c index 0d4f2df37c..ab49e489cd 100644 --- a/libavresample/avresample-test.c +++ b/libavresample/avresample-test.c @@ -305,8 +305,8 @@ int main(int argc, char **argv) goto end; } - ret = avresample_convert(s, (void **)out_data, out_linesize, out_rate * 6, - (void **) in_data, in_linesize, in_rate * 6); + ret = avresample_convert(s, out_data, out_linesize, out_rate * 6, + in_data, in_linesize, in_rate * 6); if (ret < 0) { char errbuf[256]; av_strerror(ret, errbuf, sizeof(errbuf)); diff --git a/libavresample/avresample.h b/libavresample/avresample.h index b93aba5d73..ea93952e2e 100644 --- a/libavresample/avresample.h +++ b/libavresample/avresample.h @@ -234,8 +234,8 @@ int avresample_set_compensation(AVAudioResampleContext *avr, int sample_delta, * not including converted samples added to the internal * output FIFO */ -int avresample_convert(AVAudioResampleContext *avr, void **output, - int out_plane_size, int out_samples, void **input, +int avresample_convert(AVAudioResampleContext *avr, uint8_t **output, + int out_plane_size, int out_samples, uint8_t **input, int in_plane_size, int in_samples); /** @@ -287,6 +287,6 @@ int avresample_available(AVAudioResampleContext *avr); * @param nb_samples number of samples to read from the FIFO * @return the number of samples written to output */ -int avresample_read(AVAudioResampleContext *avr, void **output, int nb_samples); +int avresample_read(AVAudioResampleContext *avr, uint8_t **output, int nb_samples); #endif /* AVRESAMPLE_AVRESAMPLE_H */ diff --git a/libavresample/utils.c b/libavresample/utils.c index 4819b57977..378dd483db 100644 --- a/libavresample/utils.c +++ b/libavresample/utils.c @@ -247,8 +247,8 @@ static int handle_buffered_output(AVAudioResampleContext *avr, } int attribute_align_arg avresample_convert(AVAudioResampleContext *avr, - void **output, int out_plane_size, - int out_samples, void **input, + uint8_t **output, int out_plane_size, + int out_samples, uint8_t **input, int in_plane_size, int in_samples) { AudioData input_buffer; @@ -410,11 +410,11 @@ int avresample_available(AVAudioResampleContext *avr) return av_audio_fifo_size(avr->out_fifo); } -int avresample_read(AVAudioResampleContext *avr, void **output, int nb_samples) +int avresample_read(AVAudioResampleContext *avr, uint8_t **output, int nb_samples) { if (!output) return av_audio_fifo_drain(avr->out_fifo, nb_samples); - return av_audio_fifo_read(avr->out_fifo, output, nb_samples); + return av_audio_fifo_read(avr->out_fifo, (void**)output, nb_samples); } unsigned avresample_version(void) -- cgit v1.2.1 From 006afc7a0b439b9c34982754403a5faefd0f0388 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Fri, 5 Oct 2012 06:59:22 +0200 Subject: lavr: bump major to 1 and declare it stable. --- libavresample/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavresample') diff --git a/libavresample/version.h b/libavresample/version.h index c4741e420e..53ba802d85 100644 --- a/libavresample/version.h +++ b/libavresample/version.h @@ -19,9 +19,9 @@ #ifndef AVRESAMPLE_VERSION_H #define AVRESAMPLE_VERSION_H -#define LIBAVRESAMPLE_VERSION_MAJOR 0 +#define LIBAVRESAMPLE_VERSION_MAJOR 1 #define LIBAVRESAMPLE_VERSION_MINOR 0 -#define LIBAVRESAMPLE_VERSION_MICRO 3 +#define LIBAVRESAMPLE_VERSION_MICRO 0 #define LIBAVRESAMPLE_VERSION_INT AV_VERSION_INT(LIBAVRESAMPLE_VERSION_MAJOR, \ LIBAVRESAMPLE_VERSION_MINOR, \ -- cgit v1.2.1