mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 08:41:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

avidemux: streamline stream duration calculation

Browse source
This commit is contained in:
Mark Nauwelaerts 2009-08-04 12:16:13 +02:00
parent d522f94f98
commit 3863871100
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
gst/avi/gstavidemux.c
View file

@ -1482,10 +1482,18 @@ gst_avi_demux_parse_stream (GstAviDemux * avi, GstBuffer * buf)
GST_DEBUG_OBJECT (avi, "Parsing stream"); GST_DEBUG_OBJECT (avi, "Parsing stream");
/* initial settings */
stream->idx_duration = GST_CLOCK_TIME_NONE;
stream->hdr_duration = GST_CLOCK_TIME_NONE;
stream->duration = GST_CLOCK_TIME_NONE;
while (gst_riff_parse_chunk (element, buf, &offset, &tag, &sub)) { while (gst_riff_parse_chunk (element, buf, &offset, &tag, &sub)) {
/* sub can be NULL if the chunk is empty */ /* sub can be NULL if the chunk is empty */
switch (tag) { switch (tag) {
case GST_RIFF_TAG_strh: case GST_RIFF_TAG_strh:
{
gst_riff_strh *strh;
if (got_strh) { if (got_strh) {
GST_WARNING_OBJECT (avi, "Ignoring additional strh chunk"); GST_WARNING_OBJECT (avi, "Ignoring additional strh chunk");
break; break;
@ -1494,8 +1502,18 @@ gst_avi_demux_parse_stream (GstAviDemux * avi, GstBuffer * buf)
GST_WARNING_OBJECT (avi, "Failed to parse strh chunk"); GST_WARNING_OBJECT (avi, "Failed to parse strh chunk");
goto fail; goto fail;
} }
/* determine duration as indicated by header */
strh = stream->strh;
stream->hdr_duration = gst_util_uint64_scale ((guint64) strh->length *
strh->scale, GST_SECOND, (guint64) strh->rate);
GST_INFO ("Stream duration according to header: %" GST_TIME_FORMAT,
GST_TIME_ARGS (stream->hdr_duration));
if (stream->hdr_duration == 0)
stream->hdr_duration = GST_CLOCK_TIME_NONE;
got_strh = TRUE; got_strh = TRUE;
break; break;
}
case GST_RIFF_TAG_strf: case GST_RIFF_TAG_strf:
{ {
gboolean res = FALSE; gboolean res = FALSE;
@ -1716,9 +1734,6 @@ gst_avi_demux_parse_stream (GstAviDemux * avi, GstBuffer * buf)
pad = stream->pad = gst_pad_new_from_template (templ, padname); pad = stream->pad = gst_pad_new_from_template (templ, padname);
stream->last_flow = GST_FLOW_OK; stream->last_flow = GST_FLOW_OK;
stream->discont = TRUE; stream->discont = TRUE;
stream->idx_duration = GST_CLOCK_TIME_NONE;
stream->hdr_duration = GST_CLOCK_TIME_NONE;
stream->duration = GST_CLOCK_TIME_NONE;
g_free (padname); g_free (padname);
gst_pad_use_fixed_caps (pad); gst_pad_use_fixed_caps (pad);
@ -2355,7 +2370,7 @@ gst_avi_demux_next_data_buffer (GstAviDemux * avi, guint64 * offset,
res = gst_avi_demux_peek_tag (avi, off, tag, &_size); res = gst_avi_demux_peek_tag (avi, off, tag, &_size);
if (res != GST_FLOW_OK) if (res != GST_FLOW_OK)
break; break;
if (*tag == GST_RIFF_TAG_LIST) if (*tag == GST_RIFF_TAG_LIST || *tag == GST_RIFF_TAG_RIFF)
off += 8 + 4; /* skip tag + size + subtag */ off += 8 + 4; /* skip tag + size + subtag */
else { else {
*offset = off + 8; *offset = off + 8;
@ -2775,7 +2790,6 @@ out_of_mem:
static void static void
gst_avi_demux_calculate_durations_from_index (GstAviDemux * avi) gst_avi_demux_calculate_durations_from_index (GstAviDemux * avi)
{ {
gst_avi_index_entry *entry;
gint stream; gint stream;
GstClockTime total; GstClockTime total;
@ -2789,26 +2803,12 @@ gst_avi_demux_calculate_durations_from_index (GstAviDemux * avi)
if (!strh) if (!strh)
continue; continue;
/* get header duration */
hduration = gst_util_uint64_scale ((guint64) strh->length *
strh->scale, GST_SECOND, (guint64) strh->rate);
GST_INFO ("Stream %d duration according to header: %" GST_TIME_FORMAT, /* get header duration for the stream */
stream, GST_TIME_ARGS (hduration)); hduration = streamc->hdr_duration;
if (hduration == 0) /* index duration calculated during parsing, invariant under massage */
hduration = GST_CLOCK_TIME_NONE; duration = streamc->idx_duration;
/* set duration for the stream */
streamc->hdr_duration = hduration;
/* get last index entry to get duration */
if ((entry = gst_avi_demux_index_last (avi, stream)))
duration = entry->ts + entry->dur;
else
duration = GST_CLOCK_TIME_NONE;
streamc->idx_duration = duration;
/* now pick a good duration */ /* now pick a good duration */
if (GST_CLOCK_TIME_IS_VALID (duration)) { if (GST_CLOCK_TIME_IS_VALID (duration)) {