avresample: Add avresample_get_out_samples

Utility function to get the upper bound on the number of samples the resampler would output.

Luca Barbato committed 12 years ago

Commit b2d45651 parent c94e2e84 files · +42 −8Browse files

Unified · Split

4 files

doc/APIchanges +3 −0
libavresample/avresample.h +19 −7
libavresample/utils.c +19 −0
libavresample/version.h +1 −1

@@ -13,6 +13,9 @@ libavutil: 2013-12-xx · 12 unmodified lines
13		13
14	API changes, most recent first:	14	API changes, most recent first:
15		15
		16	2014-04-xx - xxxxxxx - lavr 1.3.0 - avresample.h
		17	Add avresample_max_output_samples
		18
16	2014-05-24 - xxxxxxx - lavf 55.19.0 - avformat.h	19	2014-05-24 - xxxxxxx - lavf 55.19.0 - avformat.h
17	Add strict_std_compliance and related AVOptions to support experimental	20	Add strict_std_compliance and related AVOptions to support experimental
18	muxing.	21	muxing.

libavresample/avresample.h+19−7

  * while (get_input(&input, &in_linesize, &in_samples)) {
  *     uint8_t *output
  *     int out_linesize;
- *     int out_samples = avresample_available(avr) +
+ *     int out_samples = avresample_get_out_samples(avr, in_samples);
- *                       av_rescale_rnd(avresample_get_delay(avr) +
+ *
- *                                      in_samples, 44100, 48000, AV_ROUND_UP);
  *     av_samples_alloc(&output, &out_linesize, 2, out_samples,
  *                      AV_SAMPLE_FMT_S16, 0);
  *     out_samples = avresample_convert(avr, &output, out_linesize, out_samples,
 #include "libavutil/channel_layout.h"
 #include "libavutil/dict.h"
 #include "libavutil/log.h"
+#include "libavutil/mathematics.h"
 #include "libavresample/version.h"
 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
+ * The upper bound on the number of output samples can be obtained through
- * avresample_available() + (avresample_get_delay() + number of input samples) *
+ * avresample_get_out_samples().
- * output sample rate / input sample rate.
  *
  * 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
  * 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()
  *

libavresample/utils.c+19−0

@@ -622,6 +622,25 @@ int avresample_available(AVAudioResampleContext *avr) · 621 unmodified lines
622	return av_audio_fifo_size(avr->out_fifo);	622	return av_audio_fifo_size(avr->out_fifo);
623	}	623	}
624		624
		625	int avresample_get_out_samples(AVAudioResampleContext *avr, int in_nb_samples)
		626	{
		627	int64_t samples = avresample_get_delay(avr) + (int64_t)in_nb_samples;
		628
		629	if (avr->resample_needed) {
		630	samples = av_rescale_rnd(samples,
		631	avr->out_sample_rate,
		632	avr->in_sample_rate,
		633	AV_ROUND_UP);
		634	}
		635
		636	samples += avresample_available(avr);
		637
		638	if (samples > INT_MAX)
		639	return AVERROR(EINVAL);
		640
		641	return samples;
		642	}
		643
625	int avresample_read(AVAudioResampleContext avr, uint8_t *output, int nb_samples)	644	int avresample_read(AVAudioResampleContext avr, uint8_t *output, int nb_samples)
626	{	645	{
627	if (!output)	646	if (!output)

libavresample/version.h+1−1

@@ -28,7 +28,7 @@ · 27 unmodified lines
28	#include "libavutil/version.h"	28	#include "libavutil/version.h"
29		29
30	#define LIBAVRESAMPLE_VERSION_MAJOR 1	30	#define LIBAVRESAMPLE_VERSION_MAJOR 1
31	#define LIBAVRESAMPLE_VERSION_MINOR 2	31	#define LIBAVRESAMPLE_VERSION_MINOR 3
32	#define LIBAVRESAMPLE_VERSION_MICRO 0	32	#define LIBAVRESAMPLE_VERSION_MICRO 0
33		33
34	#define LIBAVRESAMPLE_VERSION_INT AV_VERSION_INT(LIBAVRESAMPLE_VERSION_MAJOR, \	34	#define LIBAVRESAMPLE_VERSION_INT AV_VERSION_INT(LIBAVRESAMPLE_VERSION_MAJOR, \

avresample: Add avresample_get_out_samples

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code