har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

av_find_stream_info() end check fixes

Browse Source 
10l (wrong time base)
  use timestamps if duration isnt available

Originally committed as revision 4301 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-05-22 08:47:09 +00:00
parent ded8477def
commit cefe0607dd
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/utils.c
View File

@ -1797,7 +1797,7 @@ int av_find_stream_info(AVFormatContext *ic)
if (pkt->duration != 0) if (pkt->duration != 0)
st->codec_info_nb_frames++; st->codec_info_nb_frames++;
if(st->codec.codec_type == CODEC_TYPE_VIDEO){ {
int index= pkt->stream_index; int index= pkt->stream_index;
int64_t last= last_dts[index]; int64_t last= last_dts[index];
int64_t duration= pkt->dts - last; int64_t duration= pkt->dts - last;
@ -1811,6 +1811,8 @@ int av_find_stream_info(AVFormatContext *ic)
duration_sum[index] += duration; duration_sum[index] += duration;
duration_count[index]+= factor; duration_count[index]+= factor;
} }
if(st->codec_info_nb_frames == 0)
st->codec_info_duration += duration;
} }
last_dts[pkt->stream_index]= pkt->dts; last_dts[pkt->stream_index]= pkt->dts;
} }
@ -1835,7 +1837,7 @@ int av_find_stream_info(AVFormatContext *ic)
(st->codec.codec_id == CODEC_ID_MPEG4 && !st->need_parsing))*/) (st->codec.codec_id == CODEC_ID_MPEG4 && !st->need_parsing))*/)
try_decode_frame(st, pkt->data, pkt->size); try_decode_frame(st, pkt->data, pkt->size);
if (st->codec_info_duration >= MAX_STREAM_DURATION) { if (av_rescale_q(st->codec_info_duration, st->time_base, AV_TIME_BASE_Q) >= MAX_STREAM_DURATION) {
break; break;
} }
count++; count++;