From b2d45654220503224aa94e78cdff19ec624e9342 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Wed, 30 Apr 2014 19:56:05 +0200 Subject: avresample: Add avresample_get_out_samples Utility function to get the upper bound on the number of samples the resampler would output. --- libavresample/avresample.h | 26 +++++++++++++++++++------- libavresample/utils.c | 19 +++++++++++++++++++ libavresample/version.h | 2 +- 3 files changed, 39 insertions(+), 8 deletions(-) (limited to 'libavresample') diff --git a/libavresample/avresample.h b/libavresample/avresample.h index 3358628e37..6105759399 100644 --- a/libavresample/avresample.h +++ b/libavresample/avresample.h @@ -76,9 +76,8 @@ * while (get_input(&input, &in_linesize, &in_samples)) { * uint8_t *output * int out_linesize; - * int out_samples = avresample_available(avr) + - * av_rescale_rnd(avresample_get_delay(avr) + - * in_samples, 44100, 48000, AV_ROUND_UP); + * int out_samples = avresample_get_out_samples(avr, in_samples); + * * av_samples_alloc(&output, &out_linesize, 2, out_samples, * AV_SAMPLE_FMT_S16, 0); * out_samples = avresample_convert(avr, &output, out_linesize, out_samples, @@ -97,6 +96,7 @@ #include "libavutil/channel_layout.h" #include "libavutil/dict.h" #include "libavutil/log.h" +#include "libavutil/mathematics.h" #include "libavresample/version.h" @@ -312,12 +312,24 @@ int avresample_set_channel_mapping(AVAudioResampleContext *avr, int avresample_set_compensation(AVAudioResampleContext *avr, int sample_delta, int compensation_distance); +/** + * Provide the upper bound on the number of samples the configured + * conversion would output. + * + * @param avr audio resample context + * @param in_nb_samples number of input samples + * + * @return number of samples or AVERROR(EINVAL) if the value + * would exceed INT_MAX + */ + +int avresample_get_out_samples(AVAudioResampleContext *avr, int in_nb_samples); + /** * Convert input samples and write them to the output FIFO. * - * The upper bound on the number of output samples is given by - * avresample_available() + (avresample_get_delay() + number of input samples) * - * output sample rate / input sample rate. + * The upper bound on the number of output samples can be obtained through + * avresample_get_out_samples(). * * The output data can be NULL or have fewer allocated samples than required. * In this case, any remaining samples not written to the output will be added @@ -334,7 +346,7 @@ int avresample_set_compensation(AVAudioResampleContext *avr, int sample_delta, * samples. To get this data as output, either call avresample_convert() with * NULL input or call avresample_read(). * - * @see avresample_available() + * @see avresample_get_out_samples() * @see avresample_read() * @see avresample_get_delay() * diff --git a/libavresample/utils.c b/libavresample/utils.c index 35bee42b50..8c5a9e2ec2 100644 --- a/libavresample/utils.c +++ b/libavresample/utils.c @@ -622,6 +622,25 @@ int avresample_available(AVAudioResampleContext *avr) return av_audio_fifo_size(avr->out_fifo); } +int avresample_get_out_samples(AVAudioResampleContext *avr, int in_nb_samples) +{ + int64_t samples = avresample_get_delay(avr) + (int64_t)in_nb_samples; + + if (avr->resample_needed) { + samples = av_rescale_rnd(samples, + avr->out_sample_rate, + avr->in_sample_rate, + AV_ROUND_UP); + } + + samples += avresample_available(avr); + + if (samples > INT_MAX) + return AVERROR(EINVAL); + + return samples; +} + int avresample_read(AVAudioResampleContext *avr, uint8_t **output, int nb_samples) { if (!output) diff --git a/libavresample/version.h b/libavresample/version.h index ca836e4a56..e74087165b 100644 --- a/libavresample/version.h +++ b/libavresample/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVRESAMPLE_VERSION_MAJOR 1 -#define LIBAVRESAMPLE_VERSION_MINOR 2 +#define LIBAVRESAMPLE_VERSION_MINOR 3 #define LIBAVRESAMPLE_VERSION_MICRO 0 #define LIBAVRESAMPLE_VERSION_INT AV_VERSION_INT(LIBAVRESAMPLE_VERSION_MAJOR, \ -- cgit v1.2.3