generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use av_find_best_stream in ffplay.

Browse Source 
Originally committed as revision 26105 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Nicolas George
2010-12-27 09:08:36 +00:00
parent 9128ae08b3
commit 406f0f1bcf
1 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
ffplay.c
View File

@@ -2398,8 +2398,6 @@ static int decode_thread(void *arg)
AVFormatContext *ic; AVFormatContext *ic;
int err, i, ret; int err, i, ret;
int st_index[AVMEDIA_TYPE_NB]; int st_index[AVMEDIA_TYPE_NB];
int st_count[AVMEDIA_TYPE_NB]={0};
int st_best_packet_count[AVMEDIA_TYPE_NB];
AVPacket pkt1, *pkt = &pkt1; AVPacket pkt1, *pkt = &pkt1;
AVFormatParameters params, *ap = &params; AVFormatParameters params, *ap = &params;
int eof=0; int eof=0;
@@ -2408,7 +2406,6 @@ static int decode_thread(void *arg)
ic = avformat_alloc_context(); ic = avformat_alloc_context();
memset(st_index, -1, sizeof(st_index)); memset(st_index, -1, sizeof(st_index));
memset(st_best_packet_count, -1, sizeof(st_best_packet_count));
is->video_stream = -1; is->video_stream = -1;
is->audio_stream = -1; is->audio_stream = -1;
is->subtitle_stream = -1; is->subtitle_stream = -1;
@@ -2464,32 +2461,25 @@ static int decode_thread(void *arg)
} }
} }
for(i = 0; i < ic->nb_streams; i++) { for (i = 0; i < ic->nb_streams; i++)
AVStream *st= ic->streams[i];
AVCodecContext *avctx = st->codec;
ic->streams[i]->discard = AVDISCARD_ALL; ic->streams[i]->discard = AVDISCARD_ALL;
if(avctx->codec_type >= (unsigned)AVMEDIA_TYPE_NB)
continue;
if(st_count[avctx->codec_type]++ != wanted_stream[avctx->codec_type] && wanted_stream[avctx->codec_type] >= 0)
continue;
if(st_best_packet_count[avctx->codec_type] >= st->codec_info_nb_frames)
continue;
st_best_packet_count[avctx->codec_type]= st->codec_info_nb_frames;
switch(avctx->codec_type) {
case AVMEDIA_TYPE_AUDIO:
if (!audio_disable) if (!audio_disable)
st_index[AVMEDIA_TYPE_AUDIO] = i; st_index[AVMEDIA_TYPE_VIDEO] =
break; av_find_best_stream(ic, AVMEDIA_TYPE_VIDEO,
case AVMEDIA_TYPE_VIDEO: wanted_stream[AVMEDIA_TYPE_VIDEO], -1, NULL, 0);
case AVMEDIA_TYPE_SUBTITLE: if (!video_disable) {
if (!video_disable) st_index[AVMEDIA_TYPE_AUDIO] =
st_index[avctx->codec_type] = i; av_find_best_stream(ic, AVMEDIA_TYPE_AUDIO,
break; wanted_stream[AVMEDIA_TYPE_AUDIO],
default: st_index[AVMEDIA_TYPE_VIDEO],
break; NULL, 0);
} st_index[AVMEDIA_TYPE_SUBTITLE] =
av_find_best_stream(ic, AVMEDIA_TYPE_SUBTITLE,
wanted_stream[AVMEDIA_TYPE_SUBTITLE],
(st_index[AVMEDIA_TYPE_AUDIO] >= 0 ?
st_index[AVMEDIA_TYPE_AUDIO] :
st_index[AVMEDIA_TYPE_VIDEO]),
NULL, 0);
} }
if (show_status) { if (show_status) {
dump_format(ic, 0, is->filename, 0); dump_format(ic, 0, is->filename, 0);