diff options
author | Matt A. Tobin <email@mattatobin.com> | 2019-11-03 14:35:17 -0500 |
---|---|---|
committer | Matt A. Tobin <email@mattatobin.com> | 2019-11-03 14:35:17 -0500 |
commit | a57983a2176afb4bab3c22efa6a24d39f3c11163 (patch) | |
tree | 56dbcb66e07d997d817e40c1fd8005ee75142e8b /media/libcubeb/src/cubeb_resampler.h | |
parent | 6513e41cb75e64384f35470d59ad6a4f88092e82 (diff) | |
parent | 1960d6e08a949ceed50e6a18240d40a7ecee879c (diff) | |
download | UXP-a57983a2176afb4bab3c22efa6a24d39f3c11163.tar UXP-a57983a2176afb4bab3c22efa6a24d39f3c11163.tar.gz UXP-a57983a2176afb4bab3c22efa6a24d39f3c11163.tar.lz UXP-a57983a2176afb4bab3c22efa6a24d39f3c11163.tar.xz UXP-a57983a2176afb4bab3c22efa6a24d39f3c11163.zip |
Merge branch 'master' into mailnews-work
Diffstat (limited to 'media/libcubeb/src/cubeb_resampler.h')
-rw-r--r-- | media/libcubeb/src/cubeb_resampler.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/media/libcubeb/src/cubeb_resampler.h b/media/libcubeb/src/cubeb_resampler.h index f6b551373..020ccc17a 100644 --- a/media/libcubeb/src/cubeb_resampler.h +++ b/media/libcubeb/src/cubeb_resampler.h @@ -25,15 +25,8 @@ typedef enum { * Create a resampler to adapt the requested sample rate into something that * is accepted by the audio backend. * @param stream A cubeb_stream instance supplied to the data callback. - * @param input_params Used to calculate bytes per frame and buffer size for - * resampling of the input side of the stream. NULL if input should not be - * resampled. - * @param output_params Used to calculate bytes per frame and buffer size for - * resampling of the output side of the stream. NULL if output should not be - * resampled. - * @param target_rate The sampling rate after resampling for the input side of - * the stream, and/or the sampling rate prior to resampling of the output side - * of the stream. + * @param params Used to calculate bytes per frame and buffer size for resampling. + * @param target_rate The sampling rate after resampling. * @param callback A callback to request data for resampling. * @param user_ptr User data supplied to the data callback. * @param quality Quality of the resampler. @@ -54,8 +47,8 @@ cubeb_resampler * cubeb_resampler_create(cubeb_stream * stream, * @param input_buffer A buffer of input samples * @param input_frame_count The size of the buffer. Returns the number of frames * consumed. - * @param output_buffer The buffer to be filled. - * @param output_frames_needed Number of frames that should be produced. + * @param buffer The buffer to be filled. + * @param frames_needed Number of frames that should be produced. * @retval Number of frames that are actually produced. * @retval CUBEB_ERROR on error. */ |