eden-emu/FFmpeg
15
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-02 18:07:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

avformat: use avcodec_decode_audio4() in avformat_find_stream_info()

Browse source
This commit is contained in:
Justin Ruggles 2011-11-02 14:35:36 -04:00
parent d1241ff3b2
commit f08e54e83d
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
libavformat/utils.c
View file

@ -2124,10 +2124,10 @@ static int has_decode_delay_been_guessed(AVStream *st)
static int try_decode_frame(AVStream *st, AVPacket *avpkt, AVDictionary **options) static int try_decode_frame(AVStream *st, AVPacket *avpkt, AVDictionary **options)
{ {
int16_t *samples;
AVCodec *codec; AVCodec *codec;
int got_picture, data_size, ret=0; int got_picture, ret = 0;
AVFrame picture; AVFrame picture;
AVPacket pkt = *avpkt;
if(!st->codec->codec){ if(!st->codec->codec){
codec = avcodec_find_decoder(st->codec->codec_id); codec = avcodec_find_decoder(st->codec->codec_id);
@ -2138,28 +2138,29 @@ static int try_decode_frame(AVStream *st, AVPacket *avpkt, AVDictionary **option
return ret; return ret;
} }
if(!has_codec_parameters(st->codec) || !has_decode_delay_been_guessed(st) || while (pkt.size > 0 && ret >= 0 &&
(!st->codec_info_nb_frames && st->codec->codec->capabilities & CODEC_CAP_CHANNEL_CONF)) { (!has_codec_parameters(st->codec) ||
!has_decode_delay_been_guessed(st) ||
(!st->codec_info_nb_frames && st->codec->codec->capabilities & CODEC_CAP_CHANNEL_CONF))) {
got_picture = 0;
avcodec_get_frame_defaults(&picture);
switch(st->codec->codec_type) { switch(st->codec->codec_type) {
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
avcodec_get_frame_defaults(&picture);
ret = avcodec_decode_video2(st->codec, &picture, ret = avcodec_decode_video2(st->codec, &picture,
&got_picture, avpkt); &got_picture, &pkt);
if (got_picture)
st->info->nb_decoded_frames++;
break; break;
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
data_size = FFMAX(avpkt->size, AVCODEC_MAX_AUDIO_FRAME_SIZE); ret = avcodec_decode_audio4(st->codec, &picture, &got_picture, &pkt);
samples = av_malloc(data_size);
if (!samples)
goto fail;
ret = avcodec_decode_audio3(st->codec, samples,
&data_size, avpkt);
av_free(samples);
break; break;
default: default:
break; break;
} }
if (ret >= 0) {
if (got_picture)
st->info->nb_decoded_frames++;
pkt.data += ret;
pkt.size -= ret;
}
} }
fail: fail:
return ret; return ret;