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

flvmux: Clean up aggregate's control flow

Browse source 
This unifies exits to go through a single out label. It mostly
simplifies how EOS is handled.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1035>
This commit is contained in:
Jan Alexander Steffens (heftig) 2020-09-13 02:17:59 +02:00 committed by GStreamer Marge Bot
parent d8ab85c3ef
commit 074f7c2e4e
1 changed files with 24 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
subprojects/gst-plugins-good/gst/flv/gstflvmux.c
View file

@ -1991,7 +1991,7 @@ static GstFlowReturn
gst_flv_mux_aggregate (GstAggregator * aggregator, gboolean timeout) gst_flv_mux_aggregate (GstAggregator * aggregator, gboolean timeout)
{ {
GstFlvMux *mux = GST_FLV_MUX (aggregator); GstFlvMux *mux = GST_FLV_MUX (aggregator);
GstFlvMuxPad *best; GstFlvMuxPad *best = NULL;
GstClockTime best_time = GST_CLOCK_TIME_NONE; GstClockTime best_time = GST_CLOCK_TIME_NONE;
GstFlowReturn ret; GstFlowReturn ret;
GstClockTime ts; GstClockTime ts;
@ -2001,21 +2001,19 @@ gst_flv_mux_aggregate (GstAggregator * aggregator, gboolean timeout)
if (GST_ELEMENT_CAST (mux)->sinkpads == NULL) { if (GST_ELEMENT_CAST (mux)->sinkpads == NULL) {
GST_ELEMENT_ERROR (mux, STREAM, MUX, (NULL), GST_ELEMENT_ERROR (mux, STREAM, MUX, (NULL),
("No input streams configured")); ("No input streams configured"));
return GST_FLOW_ERROR; ret = GST_FLOW_ERROR;
goto out;
} }
best = gst_flv_mux_find_best_pad (aggregator, &ts, timeout); best = gst_flv_mux_find_best_pad (aggregator, &ts, timeout);
if (!best) { if (!best) {
if (!gst_flv_mux_are_all_pads_eos (mux)) ret = GST_AGGREGATOR_FLOW_NEED_DATA;
return GST_AGGREGATOR_FLOW_NEED_DATA; goto out;
else
return GST_FLOW_OK;
} }
ret = gst_flv_mux_write_header (mux); ret = gst_flv_mux_write_header (mux);
if (ret != GST_FLOW_OK) { if (ret != GST_FLOW_OK) {
gst_object_unref (best); goto out;
return ret;
} }
mux->state = GST_FLV_MUX_STATE_DATA; mux->state = GST_FLV_MUX_STATE_DATA;
@ -2034,8 +2032,8 @@ gst_flv_mux_aggregate (GstAggregator * aggregator, gboolean timeout)
buffer = gst_aggregator_pad_pop_buffer (GST_AGGREGATOR_PAD (best)); buffer = gst_aggregator_pad_pop_buffer (GST_AGGREGATOR_PAD (best));
if (!buffer) { if (!buffer) {
/* We might have gotten a flush event after we picked the pad */ /* We might have gotten a flush event after we picked the pad */
gst_object_unref (best); ret = GST_AGGREGATOR_FLOW_NEED_DATA;
return GST_AGGREGATOR_FLOW_NEED_DATA; goto out;
} }
} }
@ -2064,10 +2062,6 @@ gst_flv_mux_aggregate (GstAggregator * aggregator, gboolean timeout)
GST_LOG_OBJECT (best, GST_LOG_OBJECT (best,
"got buffer PTS %" GST_TIME_FORMAT " DTS %" GST_TIME_FORMAT, "got buffer PTS %" GST_TIME_FORMAT " DTS %" GST_TIME_FORMAT,
GST_TIME_ARGS (best->pts), GST_TIME_ARGS (best->dts)); GST_TIME_ARGS (best->pts), GST_TIME_ARGS (best->dts));
} else {
if (!gst_flv_mux_are_all_pads_eos (mux))
return GST_AGGREGATOR_FLOW_NEED_DATA;
best_time = GST_CLOCK_STIME_NONE;
} }
/* The FLV timestamp is an int32 field. For non-live streams error out if a /* The FLV timestamp is an int32 field. For non-live streams error out if a
@ -2076,28 +2070,27 @@ gst_flv_mux_aggregate (GstAggregator * aggregator, gboolean timeout)
if (!mux->streamable && (GST_CLOCK_TIME_IS_VALID (best_time)) if (!mux->streamable && (GST_CLOCK_TIME_IS_VALID (best_time))
&& best_time / GST_MSECOND > G_MAXINT32) { && best_time / GST_MSECOND > G_MAXINT32) {
GST_WARNING_OBJECT (mux, "Timestamp larger than FLV supports - EOS"); GST_WARNING_OBJECT (mux, "Timestamp larger than FLV supports - EOS");
if (buffer) { ret = GST_FLOW_EOS;
gst_buffer_unref (buffer); goto out;
buffer = NULL;
}
if (best) {
gst_object_unref (best);
best = NULL;
}
} }
if (best) { if (best) {
GstFlowReturn ret = gst_flv_mux_write_buffer (mux, best, buffer); ret = gst_flv_mux_write_buffer (mux, best, g_steal_pointer (&buffer));
gst_object_unref (best); } else if (gst_flv_mux_are_all_pads_eos (mux)) {
return ret; ret = GST_FLOW_EOS;
} else { } else {
if (gst_flv_mux_are_all_pads_eos (mux)) { ret = GST_AGGREGATOR_FLOW_NEED_DATA;
}
out:
if (ret == GST_FLOW_EOS) {
gst_flv_mux_write_eos (mux); gst_flv_mux_write_eos (mux);
gst_flv_mux_rewrite_header (mux); gst_flv_mux_rewrite_header (mux);
return GST_FLOW_EOS;
}
return GST_FLOW_OK;
} }
g_clear_pointer (&buffer, gst_buffer_unref);
g_clear_pointer (&best, gst_object_unref);
return ret;
} }
static void static void