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

videoaggregator: refactor caps reconfigure to its own function

Browse source 
Makes the aggregation code shorter and easier to read
This commit is contained in:
Thiago Santos 2015-05-06 14:19:36 -03:00
parent 9f9c723f5d
commit 443a3beb8f
1 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
gst-libs/gst/video/gstvideoaggregator.c
View file

@ -1281,18 +1281,13 @@ gst_videoaggregator_get_next_time (GstAggregator * agg)
} }
static GstFlowReturn static GstFlowReturn
gst_videoaggregator_aggregate (GstAggregator * agg, gboolean timeout) gst_videoaggregator_check_reconfigure (GstVideoAggregator * vagg,
gboolean timeout)
{ {
GstVideoAggregator *vagg = GST_VIDEO_AGGREGATOR (agg); GstAggregator *agg = (GstAggregator *) vagg;
GstClockTime output_start_time, output_end_time;
GstBuffer *outbuf = NULL;
GstFlowReturn flow_ret;
gint64 jitter;
GST_VIDEO_AGGREGATOR_LOCK (vagg);
if (GST_VIDEO_INFO_FORMAT (&vagg->info) == GST_VIDEO_FORMAT_UNKNOWN if (GST_VIDEO_INFO_FORMAT (&vagg->info) == GST_VIDEO_FORMAT_UNKNOWN
|| gst_pad_check_reconfigure (agg->srcpad)) { || gst_pad_check_reconfigure (GST_AGGREGATOR_SRC_PAD (vagg))) {
gboolean ret; gboolean ret;
ret = gst_videoaggregator_update_converters (vagg); ret = gst_videoaggregator_update_converters (vagg);
@ -1300,7 +1295,7 @@ gst_videoaggregator_aggregate (GstAggregator * agg, gboolean timeout)
ret = gst_videoaggregator_update_src_caps (vagg); ret = gst_videoaggregator_update_src_caps (vagg);
if (!ret) { if (!ret) {
if (timeout && gst_pad_needs_reconfigure (agg->srcpad)) { if (timeout && gst_pad_needs_reconfigure (GST_AGGREGATOR_SRC_PAD (vagg))) {
guint64 frame_duration; guint64 frame_duration;
gint fps_d, fps_n; gint fps_d, fps_n;
@ -1328,15 +1323,36 @@ gst_videoaggregator_aggregate (GstAggregator * agg, gboolean timeout)
else else
agg->segment.position = 0; agg->segment.position = 0;
vagg->priv->nframes++; vagg->priv->nframes++;
GST_VIDEO_AGGREGATOR_UNLOCK (vagg); return GST_FLOW_NEEDS_DATA;
return GST_FLOW_OK;
} else { } else {
GST_VIDEO_AGGREGATOR_UNLOCK (vagg);
return GST_FLOW_NOT_NEGOTIATED; return GST_FLOW_NOT_NEGOTIATED;
} }
} }
} }
return GST_FLOW_OK;
}
static GstFlowReturn
gst_videoaggregator_aggregate (GstAggregator * agg, gboolean timeout)
{
GstVideoAggregator *vagg = GST_VIDEO_AGGREGATOR (agg);
GstClockTime output_start_time, output_end_time;
GstBuffer *outbuf = NULL;
GstFlowReturn flow_ret;
gint64 jitter;
GST_VIDEO_AGGREGATOR_LOCK (vagg);
flow_ret = gst_videoaggregator_check_reconfigure (vagg, timeout);
if (flow_ret == GST_FLOW_NEEDS_DATA) {
GST_VIDEO_AGGREGATOR_UNLOCK (vagg);
return GST_FLOW_OK;
} else if (flow_ret != GST_FLOW_OK) {
GST_VIDEO_AGGREGATOR_UNLOCK (vagg);
return flow_ret;
}
output_start_time = gst_videoaggregator_get_next_time (agg); output_start_time = gst_videoaggregator_get_next_time (agg);
if (GST_VIDEO_INFO_FPS_N (&vagg->info) == 0) if (GST_VIDEO_INFO_FPS_N (&vagg->info) == 0)