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

avidemux: Properly mark presence of index.

Browse source 
Instead of blindly saying we have an index, only do so if we have a
non-empty index.
This commit is contained in:
Edward Hervey 2009-10-18 15:40:37 +02:00
parent e4d6a2aa2c
commit 546aa4c4dd
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gst/avi/gstavidemux.c
View file

@ -1261,8 +1261,10 @@ gst_avi_demux_get_buffer_info (GstAviDemux * avi, GstAviStream * stream,
/* collect and debug stats about the indexes for all streams. /* collect and debug stats about the indexes for all streams.
* This method is also responsible for filling in the stream duration * This method is also responsible for filling in the stream duration
* as measured by the amount of index entries. */ * as measured by the amount of index entries.
static void *
* Returns TRUE if the index is not empty, else FALSE */
static gboolean
gst_avi_demux_do_index_stats (GstAviDemux * avi) gst_avi_demux_do_index_stats (GstAviDemux * avi)
{ {
guint i; guint i;
@ -1303,6 +1305,12 @@ gst_avi_demux_do_index_stats (GstAviDemux * avi)
#endif #endif
GST_INFO_OBJECT (avi, "%u bytes for index vs %u ideally, %u wasted", GST_INFO_OBJECT (avi, "%u bytes for index vs %u ideally, %u wasted",
total_max, total_idx, total_max - total_idx); total_max, total_idx, total_max - total_idx);
if (total_idx == 0) {
GST_WARNING_OBJECT (avi, "Index is empty !");
return FALSE;
}
return TRUE;
} }
/* /*
@ -1470,9 +1478,7 @@ gst_avi_demux_read_subindexes_push (GstAviDemux * avi)
stream->indexes = NULL; stream->indexes = NULL;
} }
/* get stream stats now */ /* get stream stats now */
gst_avi_demux_do_index_stats (avi); avi->have_index = gst_avi_demux_do_index_stats (avi);
avi->have_index = TRUE;
} }
#endif #endif
@ -1515,9 +1521,7 @@ gst_avi_demux_read_subindexes_pull (GstAviDemux * avi)
stream->indexes = NULL; stream->indexes = NULL;
} }
/* get stream stats now */ /* get stream stats now */
gst_avi_demux_do_index_stats (avi); avi->have_index = gst_avi_demux_do_index_stats (avi);
avi->have_index = TRUE;
} }
/* /*
@ -2346,15 +2350,12 @@ gst_avi_demux_parse_index (GstAviDemux * avi, GstBuffer * buf)
gst_buffer_unref (buf); gst_buffer_unref (buf);
/* get stream stats now */ /* get stream stats now */
gst_avi_demux_do_index_stats (avi); avi->have_index = gst_avi_demux_do_index_stats (avi);
stamp = gst_util_get_timestamp () - stamp; stamp = gst_util_get_timestamp () - stamp;
GST_DEBUG_OBJECT (avi, "parsing index %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (avi, "parsing index %" GST_TIME_FORMAT,
GST_TIME_ARGS (stamp)); GST_TIME_ARGS (stamp));
/* we have an index now */
avi->have_index = TRUE;
return TRUE; return TRUE;
/* ERRORS */ /* ERRORS */
@ -2625,11 +2626,10 @@ gst_avi_demux_stream_scan (GstAviDemux * avi)
break; break;
} }
} }
/* collect stats */
gst_avi_demux_do_index_stats (avi);
/* we have an index now */ /* collect stats */
avi->have_index = TRUE; avi->have_index = gst_avi_demux_do_index_stats (avi);
return TRUE; return TRUE;