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

aggregator: disable tag merging and forwarding for now

Browse source 
Subclasses should handle this for now.
This commit is contained in:
Tim-Philipp Müller 2017-12-04 12:29:05 +00:00
parent d9b20492f3
commit e9483fbffb
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libs/gst/base/gstaggregator.c
View file

@ -116,8 +116,10 @@ gst_aggregator_start_time_selection_get_type (void)
} }
/* Might become API */ /* Might become API */
#if 0
static void gst_aggregator_merge_tags (GstAggregator * aggregator, static void gst_aggregator_merge_tags (GstAggregator * aggregator,
const GstTagList * tags, GstTagMergeMode mode); const GstTagList * tags, GstTagMergeMode mode);
#endif
static void gst_aggregator_set_latency_property (GstAggregator * agg, static void gst_aggregator_set_latency_property (GstAggregator * agg,
GstClockTime latency); GstClockTime latency);
static GstClockTime gst_aggregator_get_latency_property (GstAggregator * agg); static GstClockTime gst_aggregator_get_latency_property (GstAggregator * agg);
@ -1428,19 +1430,7 @@ gst_aggregator_default_sink_event (GstAggregator * self,
goto eat; goto eat;
} }
case GST_EVENT_TAG: case GST_EVENT_TAG:
{ goto eat;
GstTagList *tags;
gst_event_parse_tag (event, &tags);
if (gst_tag_list_get_scope (tags) == GST_TAG_SCOPE_STREAM) {
gst_aggregator_merge_tags (self, tags, GST_TAG_MERGE_REPLACE);
gst_event_unref (event);
event = NULL;
goto eat;
}
break;
}
default: default:
{ {
break; break;
@ -2912,7 +2902,8 @@ gst_aggregator_pad_is_eos (GstAggregatorPad * pad)
return is_eos; return is_eos;
} }
/** #if 0
/*
* gst_aggregator_merge_tags: * gst_aggregator_merge_tags:
* @self: a #GstAggregator * @self: a #GstAggregator
* @tags: a #GstTagList to merge * @tags: a #GstTagList to merge
@ -2946,6 +2937,7 @@ gst_aggregator_merge_tags (GstAggregator * self,
self->priv->tags_changed = TRUE; self->priv->tags_changed = TRUE;
GST_OBJECT_UNLOCK (self); GST_OBJECT_UNLOCK (self);
} }
#endif
/** /**
* gst_aggregator_set_latency: * gst_aggregator_set_latency: