FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

avidemux: fallback to avih duration

Browse Source 
when we have not yet parsed the indexes (in push mode, for example) use
the duration as given in the avih header instead of -1.
This commit is contained in:
Wim Taymans 2010-01-15 18:09:15 +01:00
parent e61a71b490
commit d4301d900f
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gst/avi/gstavidemux.c
View File

@ -524,18 +524,24 @@ gst_avi_demux_handle_src_query (GstPad * pad, GstQuery * query)
case GST_QUERY_DURATION: case GST_QUERY_DURATION:
{ {
GstFormat fmt; GstFormat fmt;
GstClockTime duration;
/* only act on audio or video streams */
if (stream->strh->type != GST_RIFF_FCC_auds && if (stream->strh->type != GST_RIFF_FCC_auds &&
stream->strh->type != GST_RIFF_FCC_vids) { stream->strh->type != GST_RIFF_FCC_vids) {
res = FALSE; res = FALSE;
break; break;
} }
/* take stream duration, fall back to avih duration */
if ((duration = stream->duration) == -1)
duration = avi->duration;
gst_query_parse_duration (query, &fmt, NULL); gst_query_parse_duration (query, &fmt, NULL);
switch (fmt) { switch (fmt) {
case GST_FORMAT_TIME: case GST_FORMAT_TIME:
gst_query_set_duration (query, fmt, stream->duration); gst_query_set_duration (query, fmt, duration);
break; break;
case GST_FORMAT_DEFAULT: case GST_FORMAT_DEFAULT:
{ {
@ -546,7 +552,7 @@ gst_avi_demux_handle_src_query (GstPad * pad, GstQuery * query)
if (stream->idx_n >= 0) if (stream->idx_n >= 0)
gst_query_set_duration (query, fmt, stream->idx_n); gst_query_set_duration (query, fmt, stream->idx_n);
else if (gst_pad_query_convert (pad, GST_FORMAT_TIME, else if (gst_pad_query_convert (pad, GST_FORMAT_TIME,
stream->duration, &fmt, &dur)) duration, &fmt, &dur))
gst_query_set_duration (query, fmt, dur); gst_query_set_duration (query, fmt, dur);
break; break;
} }
@ -1011,6 +1017,7 @@ gst_avi_demux_parse_avih (GstElement * element,
GstBuffer * buf, gst_riff_avih ** _avih) GstBuffer * buf, gst_riff_avih ** _avih)
{ {
gst_riff_avih *avih; gst_riff_avih *avih;
GstAviDemux *avi = GST_AVI_DEMUX (element);
if (buf == NULL) if (buf == NULL)
goto no_buffer; goto no_buffer;
@ -1057,6 +1064,15 @@ gst_avi_demux_parse_avih (GstElement * element,
*_avih = avih; *_avih = avih;
gst_buffer_unref (buf); gst_buffer_unref (buf);
if (avih->us_frame != 0 && avih->tot_frames != 0)
avi->duration =
(guint64) avih->us_frame * (guint64) avih->tot_frames * 1000;
else
avi->duration = GST_CLOCK_TIME_NONE;
GST_INFO_OBJECT (element, " header duration %" GST_TIME_FORMAT,
GST_TIME_ARGS (avi->duration));
return TRUE; return TRUE;
/* ERRORS */ /* ERRORS */

1
gst/avi/gstavidemux.h
View File

@ -174,6 +174,7 @@ typedef struct _GstAviDemux {
/* some stream info for length */ /* some stream info for length */
gst_riff_avih *avih; gst_riff_avih *avih;
GstClockTime duration;
/* segment in TIME */ /* segment in TIME */
GstSegment segment; GstSegment segment;