mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

flvdemux: Speedup GstIndex usage

Browse source 
Used the _add_associationv variant of GstIndex since we know how many
associations we're adding. Trims up to 50% from index generation time.

Note : It would be great if the index could be generated on the fly or
on request as opposed to being fully created at startup.
This commit is contained in:
Edward Hervey 2010-02-13 11:01:53 +01:00
parent 7f08081016
commit 0dd06da5e8
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gst/flv/gstflvparse.c
View file

@ -425,14 +425,20 @@ gst_flv_parse_tag_script (GstFLVDemux * demux, GstBuffer * buffer)
/* If an index was found and we're in push mode, insert associations */ /* If an index was found and we're in push mode, insert associations */
for (i = 0; i < MIN (demux->times->len, demux->filepositions->len); i++) { for (i = 0; i < MIN (demux->times->len, demux->filepositions->len); i++) {
guint64 time, fileposition; guint64 time, fileposition;
static GstIndexAssociation associations[2];
time = g_array_index (demux->times, gdouble, i) * GST_SECOND; time = g_array_index (demux->times, gdouble, i) * GST_SECOND;
fileposition = g_array_index (demux->filepositions, gdouble, i); fileposition = g_array_index (demux->filepositions, gdouble, i);
GST_LOG_OBJECT (demux, "adding association %" GST_TIME_FORMAT "-> %" GST_LOG_OBJECT (demux, "adding association %" GST_TIME_FORMAT "-> %"
G_GUINT64_FORMAT, GST_TIME_ARGS (time), fileposition); G_GUINT64_FORMAT, GST_TIME_ARGS (time), fileposition);
gst_index_add_association (demux->index, demux->index_id, associations[0].format = GST_FORMAT_TIME;
GST_ASSOCIATION_FLAG_KEY_UNIT, GST_FORMAT_TIME, time, associations[0].value = time;
GST_FORMAT_BYTES, fileposition, NULL); associations[1].format = GST_FORMAT_BYTES;
associations[1].value = fileposition;
gst_index_add_associationv (demux->index, demux->index_id,
GST_ASSOCIATION_FLAG_KEY_UNIT, 2,
(const GstIndexAssociation *) &associations);
} }
demux->indexed = TRUE; demux->indexed = TRUE;
} }
@ -1237,12 +1243,19 @@ gst_flv_parse_tag_timestamp (GstFLVDemux * demux, GstBuffer * buffer,
if (demux->index && !demux->indexed && (type == 9 || (type == 8 if (demux->index && !demux->indexed && (type == 9 || (type == 8
&& !demux->has_video))) { && !demux->has_video))) {
static GstIndexAssociation associations[2];
GST_LOG_OBJECT (demux, GST_LOG_OBJECT (demux,
"adding association %" GST_TIME_FORMAT "-> %" G_GUINT64_FORMAT, "adding association %" GST_TIME_FORMAT "-> %" G_GUINT64_FORMAT,
GST_TIME_ARGS (ret), demux->offset); GST_TIME_ARGS (ret), demux->offset);
gst_index_add_association (demux->index, demux->index_id,
associations[0].format = GST_FORMAT_TIME;
associations[0].value = ret;
associations[1].format = GST_FORMAT_BYTES;
associations[1].value = demux->offset;
gst_index_add_associationv (demux->index, demux->index_id,
(keyframe) ? GST_ASSOCIATION_FLAG_KEY_UNIT : GST_ASSOCIATION_FLAG_NONE, (keyframe) ? GST_ASSOCIATION_FLAG_KEY_UNIT : GST_ASSOCIATION_FLAG_NONE,
GST_FORMAT_TIME, ret, GST_FORMAT_BYTES, demux->offset, NULL); 2, (const GstIndexAssociation *) &associations);
} }
if (demux->duration == GST_CLOCK_TIME_NONE || demux->duration < ret) if (demux->duration == GST_CLOCK_TIME_NONE || demux->duration < ret)