virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avplay: use audio parameters from the decoded frame instead of AVCodecContext

Browse Source
This commit is contained in:
Justin Ruggles
2012-10-07 23:55:32 -04:00
parent 61d5313d94
commit f5962229bf
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
avplay.c
View File

@@ -1905,13 +1905,13 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
} }
data_size = av_samples_get_buffer_size(NULL, dec->channels, data_size = av_samples_get_buffer_size(NULL, dec->channels,
is->frame->nb_samples, is->frame->nb_samples,
dec->sample_fmt, 1); is->frame->format, 1);
audio_resample = dec->sample_fmt != is->sdl_sample_fmt || audio_resample = is->frame->format != is->sdl_sample_fmt ||
dec->channel_layout != is->sdl_channel_layout; is->frame->channel_layout != is->sdl_channel_layout;
resample_changed = dec->sample_fmt != is->resample_sample_fmt || resample_changed = is->frame->format != is->resample_sample_fmt ||
dec->channel_layout != is->resample_channel_layout; is->frame->channel_layout != is->resample_channel_layout;
if ((!is->avr && audio_resample) || resample_changed) { if ((!is->avr && audio_resample) || resample_changed) {
int ret; int ret;
@@ -1925,9 +1925,9 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
} }
} }
if (audio_resample) { if (audio_resample) {
av_opt_set_int(is->avr, "in_channel_layout", dec->channel_layout, 0); av_opt_set_int(is->avr, "in_channel_layout", is->frame->channel_layout, 0);
av_opt_set_int(is->avr, "in_sample_fmt", dec->sample_fmt, 0); av_opt_set_int(is->avr, "in_sample_fmt", is->frame->format, 0);
av_opt_set_int(is->avr, "in_sample_rate", dec->sample_rate, 0); av_opt_set_int(is->avr, "in_sample_rate", is->frame->sample_rate, 0);
av_opt_set_int(is->avr, "out_channel_layout", is->sdl_channel_layout, 0); av_opt_set_int(is->avr, "out_channel_layout", is->sdl_channel_layout, 0);
av_opt_set_int(is->avr, "out_sample_fmt", is->sdl_sample_fmt, 0); av_opt_set_int(is->avr, "out_sample_fmt", is->sdl_sample_fmt, 0);
av_opt_set_int(is->avr, "out_sample_rate", dec->sample_rate, 0); av_opt_set_int(is->avr, "out_sample_rate", dec->sample_rate, 0);
@@ -1937,8 +1937,8 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
break; break;
} }
} }
is->resample_sample_fmt = dec->sample_fmt; is->resample_sample_fmt = is->frame->format;
is->resample_channel_layout = dec->channel_layout; is->resample_channel_layout = is->frame->channel_layout;
} }
if (audio_resample) { if (audio_resample) {