RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-09 00:29:54 +00:00
Code Issues Projects Releases Wiki Activity

lavr: do not pass sample count as a parameter to ff_audio_convert()

Browse Source 
It will always be the number of samples in the input buffer, so just use that
directly instead of passing it as a separate parameter.
This commit is contained in:
Justin Ruggles 2012-11-01 00:44:11 -04:00
parent 28e1cf19aa
commit 7f534d11ed
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavresample/audio_convert.c
View File

@ -284,9 +284,10 @@ AudioConvert *ff_audio_convert_alloc(AVAudioResampleContext *avr,
return ac;
}
int ff_audio_convert(AudioConvert *ac, AudioData *out, AudioData *in, int len)
int ff_audio_convert(AudioConvert *ac, AudioData *out, AudioData *in)
{
int use_generic = 1;
int len = in->nb_samples;
/* determine whether to use the optimized function based on pointer and
samples alignment in both the input and output */

7
libavresample/audio_convert.h
View File

@ -72,13 +72,16 @@ AudioConvert *ff_audio_convert_alloc(AVAudioResampleContext *avr,
* examined to determine whether to use the generic or optimized conversion
* function (when available).
*
* The number of samples to convert is determined by in->nb_samples. The output
* buffer must be large enough to handle this many samples. out->nb_samples is
* set by this function before a successful return.
*
* @param ac AudioConvert context
* @param out output audio data
* @param in input audio data
* @param len number of samples to convert
* @return 0 on success, negative AVERROR code on failure
*/
int ff_audio_convert(AudioConvert *ac, AudioData *out, AudioData *in, int len);
int ff_audio_convert(AudioConvert *ac, AudioData *out, AudioData *in);
/* arch-specific initialization functions */

9
libavresample/utils.c
View File

@ -313,8 +313,8 @@ int attribute_align_arg avresample_convert(AVAudioResampleContext *avr,
if (ret < 0)
return ret;
av_dlog(avr, "[convert] %s to in_buffer\n", current_buffer->name);
ret = ff_audio_convert(avr->ac_in, avr->in_buffer, current_buffer,
current_buffer->nb_samples);
ret = ff_audio_convert(avr->ac_in, avr->in_buffer,
current_buffer);
if (ret < 0)
return ret;
} else {
@ -381,8 +381,7 @@ int attribute_align_arg avresample_convert(AVAudioResampleContext *avr,
if (direct_output && out_samples >= current_buffer->nb_samples) {
/* convert directly to output */
av_dlog(avr, "[convert] %s to output\n", current_buffer->name);
ret = ff_audio_convert(avr->ac_out, &output_buffer, current_buffer,
current_buffer->nb_samples);
ret = ff_audio_convert(avr->ac_out, &output_buffer, current_buffer);
if (ret < 0)
return ret;
@ -395,7 +394,7 @@ int attribute_align_arg avresample_convert(AVAudioResampleContext *avr,
return ret;
av_dlog(avr, "[convert] %s to out_buffer\n", current_buffer->name);
ret = ff_audio_convert(avr->ac_out, avr->out_buffer,
current_buffer, current_buffer->nb_samples);
current_buffer);
if (ret < 0)
return ret;
current_buffer = avr->out_buffer;