mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-01 06:01:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

aggregator: Add optional GstStructure info parameter to "samples-selected" signal

Browse source 
Subclasses can use this to provide more information, for example
audioaggregator could provide the offset into the output buffer where
the next data is going to be filled.

See https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/805

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/590>
This commit is contained in:
Sebastian Dröge 2020-08-07 09:30:55 +03:00
parent e243e152f0
commit 84385bdd86
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2739,6 +2739,7 @@ gst_aggregator_class_init (GstAggregatorClass * klass)
* @pts: The presentation timestamp of the next output buffer * @pts: The presentation timestamp of the next output buffer
* @dts: The decoding timestamp of the next output buffer * @dts: The decoding timestamp of the next output buffer
* @duration: The duration of the next output buffer * @duration: The duration of the next output buffer
* @info: (nullable): a #GstStructure containing additional information
* *
* Signals that the #GstAggregator subclass has selected the next set * Signals that the #GstAggregator subclass has selected the next set
* of input samples it will aggregate. Handlers may call * of input samples it will aggregate. Handlers may call
@ -2748,9 +2749,10 @@ gst_aggregator_class_init (GstAggregatorClass * klass)
*/ */
gst_aggregator_signals[SIGNAL_SAMPLES_SELECTED] = gst_aggregator_signals[SIGNAL_SAMPLES_SELECTED] =
g_signal_new ("samples-selected", G_TYPE_FROM_CLASS (klass), g_signal_new ("samples-selected", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL, G_TYPE_NONE, 4, G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL, G_TYPE_NONE, 5,
GST_TYPE_SEGMENT | G_SIGNAL_TYPE_STATIC_SCOPE, GST_TYPE_CLOCK_TIME, GST_TYPE_SEGMENT | G_SIGNAL_TYPE_STATIC_SCOPE, GST_TYPE_CLOCK_TIME,
GST_TYPE_CLOCK_TIME, GST_TYPE_CLOCK_TIME); GST_TYPE_CLOCK_TIME, GST_TYPE_CLOCK_TIME,
GST_TYPE_STRUCTURE | G_SIGNAL_TYPE_STATIC_SCOPE);
} }
static inline gpointer static inline gpointer
@ -3615,6 +3617,7 @@ gst_aggregator_update_segment (GstAggregator * self, const GstSegment * segment)
* @pts: The presentation timestamp of the next output buffer * @pts: The presentation timestamp of the next output buffer
* @dts: The decoding timestamp of the next output buffer * @dts: The decoding timestamp of the next output buffer
* @duration: The duration of the next output buffer * @duration: The duration of the next output buffer
* @info: (nullable): a #GstStructure containing additional information
* *
* Subclasses should call this when they have prepared the * Subclasses should call this when they have prepared the
* buffers they will aggregate for each of their sink pads, but * buffers they will aggregate for each of their sink pads, but
@ -3629,13 +3632,14 @@ gst_aggregator_update_segment (GstAggregator * self, const GstSegment * segment)
*/ */
void void
gst_aggregator_selected_samples (GstAggregator * self, gst_aggregator_selected_samples (GstAggregator * self,
GstClockTime pts, GstClockTime dts, GstClockTime duration) GstClockTime pts, GstClockTime dts, GstClockTime duration,
GstStructure * info)
{ {
g_return_if_fail (GST_IS_AGGREGATOR (self)); g_return_if_fail (GST_IS_AGGREGATOR (self));
if (self->priv->emit_signals) { if (self->priv->emit_signals) {
g_signal_emit (self, gst_aggregator_signals[SIGNAL_SAMPLES_SELECTED], 0, g_signal_emit (self, gst_aggregator_signals[SIGNAL_SAMPLES_SELECTED], 0,
&GST_AGGREGATOR_PAD (self->srcpad)->segment, pts, dts, duration); &GST_AGGREGATOR_PAD (self->srcpad)->segment, pts, dts, duration, info);
} }
self->priv->selected_samples_called_or_warned = TRUE; self->priv->selected_samples_called_or_warned = TRUE;

3
libs/gst/base/gstaggregator.h
View file

@ -421,7 +421,8 @@ GST_BASE_API
void gst_aggregator_selected_samples (GstAggregator * self, void gst_aggregator_selected_samples (GstAggregator * self,
GstClockTime pts, GstClockTime pts,
GstClockTime dts, GstClockTime dts,
GstClockTime duration); GstClockTime duration,
GstStructure * info);
/** /**
* GstAggregatorStartTimeSelection: * GstAggregatorStartTimeSelection: