mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-22 01:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

matroskamux: Delay stream-header until all sink pads have caps

Browse source 
If we don't wait, an incomplete header might be generated due to a race between
the _aggregate thread and the sink pad setcaps.

Fixes #3929

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7872>
This commit is contained in:
Philippe Normand 2024-10-28 14:21:40 +00:00 committed by GStreamer Marge Bot
parent 2766e4816a
commit 701f563996
1 changed files with 37 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
subprojects/gst-plugins-good/gst/matroska/matroska-mux.c
View file

@ -4241,6 +4241,27 @@ gst_matroska_mux_all_pads_eos (GstMatroskaMux * mux)
return TRUE; return TRUE;
} }
static gboolean
gst_matroska_mux_all_pads_have_codec_id (GstMatroskaMux * mux)
{
GList *l;
gboolean result = TRUE;
GST_OBJECT_LOCK (mux);
for (l = GST_ELEMENT (mux)->sinkpads; l; l = g_list_next (l)) {
GstMatroskaMuxPad *pad = l->data;
if (!pad->track->codec_id) {
result = FALSE;
break;
}
}
GST_OBJECT_UNLOCK (mux);
return result;
}
static GstFlowReturn static GstFlowReturn
gst_matroska_mux_aggregate (GstAggregator * agg, gboolean timeout) gst_matroska_mux_aggregate (GstAggregator * agg, gboolean timeout)
{ {
@ -4253,18 +4274,6 @@ gst_matroska_mux_aggregate (GstAggregator * agg, gboolean timeout)
GST_DEBUG_OBJECT (mux, "Aggregating (timeout: %d)", timeout); GST_DEBUG_OBJECT (mux, "Aggregating (timeout: %d)", timeout);
/* start with a header */
if (mux->state == GST_MATROSKA_MUX_STATE_START) {
mux->state = GST_MATROSKA_MUX_STATE_HEADER;
gst_ebml_start_streamheader (ebml);
if (!gst_matroska_mux_start_file (mux)) {
ret = GST_FLOW_ERROR;
goto exit;
}
gst_matroska_mux_stop_streamheader (mux);
mux->state = GST_MATROSKA_MUX_STATE_DATA;
}
best = gst_matroska_mux_find_best_pad (mux, timeout); best = gst_matroska_mux_find_best_pad (mux, timeout);
/* if there is no best pad, we have reached EOS or timed out without any /* if there is no best pad, we have reached EOS or timed out without any
@ -4284,6 +4293,22 @@ gst_matroska_mux_aggregate (GstAggregator * agg, gboolean timeout)
goto exit; goto exit;
} }
/* start with a header */
if (mux->state == GST_MATROSKA_MUX_STATE_START) {
if (!gst_matroska_mux_all_pads_have_codec_id (mux)) {
ret = GST_AGGREGATOR_FLOW_NEED_DATA;
goto exit;
}
mux->state = GST_MATROSKA_MUX_STATE_HEADER;
gst_ebml_start_streamheader (ebml);
if (!gst_matroska_mux_start_file (mux)) {
ret = GST_FLOW_ERROR;
goto exit;
}
gst_matroska_mux_stop_streamheader (mux);
mux->state = GST_MATROSKA_MUX_STATE_DATA;
}
if (best->track->codec_id == NULL) { if (best->track->codec_id == NULL) {
GST_ERROR_OBJECT (best, "No codec-id for pad"); GST_ERROR_OBJECT (best, "No codec-id for pad");
ret = GST_FLOW_NOT_NEGOTIATED; ret = GST_FLOW_NOT_NEGOTIATED;