RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-07 21:17:58 +00:00
Code Issues Projects Releases Wiki Activity

ffplay: factorize expression in audio_decode_frame()

Browse Source 
Possibly improve readability.
This commit is contained in:
Stefano Sabatini 2012-06-30 00:02:58 +02:00
parent 6f5e7e8690
commit b12e61ac7f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffplay.c
View File

@ -1985,6 +1985,7 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
if (is->swr_ctx) { if (is->swr_ctx) {
const uint8_t *in[] = { is->frame->data[0] }; const uint8_t *in[] = { is->frame->data[0] };
uint8_t *out[] = {is->audio_buf2}; uint8_t *out[] = {is->audio_buf2};
int out_count = sizeof(is->audio_buf2) / is->audio_tgt.channels / av_get_bytes_per_sample(is->audio_tgt.fmt);
if (wanted_nb_samples != is->frame->nb_samples) { if (wanted_nb_samples != is->frame->nb_samples) {
if (swr_set_compensation(is->swr_ctx, (wanted_nb_samples - is->frame->nb_samples) * is->audio_tgt.freq / dec->sample_rate, if (swr_set_compensation(is->swr_ctx, (wanted_nb_samples - is->frame->nb_samples) * is->audio_tgt.freq / dec->sample_rate,
wanted_nb_samples * is->audio_tgt.freq / dec->sample_rate) < 0) { wanted_nb_samples * is->audio_tgt.freq / dec->sample_rate) < 0) {
@ -1992,13 +1993,12 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
break; break;
} }
} }
len2 = swr_convert(is->swr_ctx, out, sizeof(is->audio_buf2) / is->audio_tgt.channels / av_get_bytes_per_sample(is->audio_tgt.fmt), len2 = swr_convert(is->swr_ctx, out, out_count, in, is->frame->nb_samples);
in, is->frame->nb_samples);
if (len2 < 0) { if (len2 < 0) {
fprintf(stderr, "swr_convert() failed\n"); fprintf(stderr, "swr_convert() failed\n");
break; break;
} }
if (len2 == sizeof(is->audio_buf2) / is->audio_tgt.channels / av_get_bytes_per_sample(is->audio_tgt.fmt)) { if (len2 == out_count) {
fprintf(stderr, "warning: audio buffer is probably too small\n"); fprintf(stderr, "warning: audio buffer is probably too small\n");
swr_init(is->swr_ctx); swr_init(is->swr_ctx);
} }