mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-06-07 16:08:51 +00:00
flvmux: Return NEED_DATA when no best pad is found
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/696>
This commit is contained in:
parent
59aab55e71
commit
75f6ca8a11
1 changed files with 8 additions and 0 deletions
|
@ -1959,6 +1959,12 @@ gst_flv_mux_aggregate (GstAggregator * aggregator, gboolean timeout)
|
||||||
}
|
}
|
||||||
|
|
||||||
best = gst_flv_mux_find_best_pad (aggregator, &ts);
|
best = gst_flv_mux_find_best_pad (aggregator, &ts);
|
||||||
|
if (!best) {
|
||||||
|
if (!gst_flv_mux_are_all_pads_eos (mux))
|
||||||
|
return GST_AGGREGATOR_FLOW_NEED_DATA;
|
||||||
|
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) {
|
||||||
|
@ -2006,6 +2012,8 @@ gst_flv_mux_aggregate (GstAggregator * aggregator, gboolean timeout)
|
||||||
GST_STIME_FORMAT, GST_TIME_ARGS (best->pts),
|
GST_STIME_FORMAT, GST_TIME_ARGS (best->pts),
|
||||||
GST_STIME_ARGS (best->dts));
|
GST_STIME_ARGS (best->dts));
|
||||||
} else {
|
} else {
|
||||||
|
if (!gst_flv_mux_are_all_pads_eos (mux))
|
||||||
|
return GST_AGGREGATOR_FLOW_NEED_DATA;
|
||||||
best_time = GST_CLOCK_STIME_NONE;
|
best_time = GST_CLOCK_STIME_NONE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue