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

Make sure that if a stream has a duration but the container doesn't

Browse Source 
then the container duration is set from the stream duration.

patch by Neil Brown: [ neilb suse de]
original thread: [FFmpeg-devel] [patch 3/3] Make timing calculations
less dependant on start_time being defined.
date: 08/16/2007 08:27 AM

Originally committed as revision 10408 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Neil Brown 2007-09-05 16:47:48 +00:00 committed by Benoit Fouet
parent afebe2f7ca
commit c1e8b67869
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libavformat/utils.c
View File

@ -1364,19 +1364,18 @@ int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp, int f
/*******************************************************/ /*******************************************************/
/** /**
* Returns TRUE if the stream has accurate timings in any stream. * Returns TRUE if the stream has accurate duration in any stream.
* *
* @return TRUE if the stream has accurate timings for at least one component. * @return TRUE if the stream has accurate duration for at least one component.
*/ */
static int av_has_timings(AVFormatContext *ic) static int av_has_duration(AVFormatContext *ic)
{ {
int i; int i;
AVStream *st; AVStream *st;
for(i = 0;i < ic->nb_streams; i++) { for(i = 0;i < ic->nb_streams; i++) {
st = ic->streams[i]; st = ic->streams[i];
if (st->start_time != AV_NOPTS_VALUE && if (st->duration != AV_NOPTS_VALUE)
st->duration != AV_NOPTS_VALUE)
return 1; return 1;
} }
return 0; return 0;
@ -1390,11 +1389,13 @@ static int av_has_timings(AVFormatContext *ic)
static void av_update_stream_timings(AVFormatContext *ic) static void av_update_stream_timings(AVFormatContext *ic)
{ {
int64_t start_time, start_time1, end_time, end_time1; int64_t start_time, start_time1, end_time, end_time1;
int64_t duration, duration1;
int i; int i;
AVStream *st; AVStream *st;
start_time = INT64_MAX; start_time = INT64_MAX;
end_time = INT64_MIN; end_time = INT64_MIN;
duration = INT64_MIN;
for(i = 0;i < ic->nb_streams; i++) { for(i = 0;i < ic->nb_streams; i++) {
st = ic->streams[i]; st = ic->streams[i];
if (st->start_time != AV_NOPTS_VALUE) { if (st->start_time != AV_NOPTS_VALUE) {
@ -1408,19 +1409,27 @@ static void av_update_stream_timings(AVFormatContext *ic)
end_time = end_time1; end_time = end_time1;
} }
} }
if (st->duration != AV_NOPTS_VALUE) {
duration1 = av_rescale_q(st->duration, st->time_base, AV_TIME_BASE_Q);
if (duration1 > duration)
duration = duration1;
}
} }
if (start_time != INT64_MAX) { if (start_time != INT64_MAX) {
ic->start_time = start_time; ic->start_time = start_time;
if (end_time != INT64_MIN) { if (end_time != INT64_MIN) {
ic->duration = end_time - start_time; if (end_time - start_time > duration)
if (ic->file_size > 0) { duration = end_time - start_time;
/* compute the bit rate */ }
ic->bit_rate = (double)ic->file_size * 8.0 * AV_TIME_BASE / }
(double)ic->duration; if (duration != INT64_MIN) {
} ic->duration = duration;
if (ic->file_size > 0) {
/* compute the bit rate */
ic->bit_rate = (double)ic->file_size * 8.0 * AV_TIME_BASE /
(double)ic->duration;
} }
} }
} }
static void fill_all_stream_timings(AVFormatContext *ic) static void fill_all_stream_timings(AVFormatContext *ic)
@ -1587,7 +1596,7 @@ static void av_estimate_timings(AVFormatContext *ic, offset_t old_offset)
file_size && !ic->pb.is_streamed) { file_size && !ic->pb.is_streamed) {
/* get accurate estimate from the PTSes */ /* get accurate estimate from the PTSes */
av_estimate_timings_from_pts(ic, old_offset); av_estimate_timings_from_pts(ic, old_offset);
} else if (av_has_timings(ic)) { } else if (av_has_duration(ic)) {
/* at least one components has timings - we use them for all /* at least one components has timings - we use them for all
the components */ the components */
fill_all_stream_timings(ic); fill_all_stream_timings(ic);