mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-06 10:42:22 +00:00
decodebin3: Cleanup no more used DecodebinInput
Remove DecodebinInput using gst_element_call_async() API. https://bugzilla.gnome.org/show_bug.cgi?id=773341
This commit is contained in:
parent
bd6ec225b9
commit
f08e4592a4
1 changed files with 21 additions and 0 deletions
|
@ -484,6 +484,7 @@ static gboolean have_factory (GstDecodebin3 * dbin, GstCaps * caps,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void free_input (GstDecodebin3 * dbin, DecodebinInput * input);
|
static void free_input (GstDecodebin3 * dbin, DecodebinInput * input);
|
||||||
|
static void free_input_async (GstDecodebin3 * dbin, DecodebinInput * input);
|
||||||
static DecodebinInput *create_new_input (GstDecodebin3 * dbin, gboolean main);
|
static DecodebinInput *create_new_input (GstDecodebin3 * dbin, gboolean main);
|
||||||
static gboolean set_input_group_id (DecodebinInput * input, guint32 * group_id);
|
static gboolean set_input_group_id (DecodebinInput * input, guint32 * group_id);
|
||||||
|
|
||||||
|
@ -812,6 +813,18 @@ gst_decodebin3_input_pad_unlink (GstPad * pad, GstObject * parent)
|
||||||
if (GST_OBJECT_PARENT (GST_OBJECT (input->parsebin)) == GST_OBJECT (dbin)) {
|
if (GST_OBJECT_PARENT (GST_OBJECT (input->parsebin)) == GST_OBJECT (dbin)) {
|
||||||
gst_bin_remove (GST_BIN (dbin), input->parsebin);
|
gst_bin_remove (GST_BIN (dbin), input->parsebin);
|
||||||
gst_element_set_state (input->parsebin, GST_STATE_NULL);
|
gst_element_set_state (input->parsebin, GST_STATE_NULL);
|
||||||
|
g_signal_handler_disconnect (input->parsebin, input->pad_removed_sigid);
|
||||||
|
g_signal_handler_disconnect (input->parsebin, input->pad_added_sigid);
|
||||||
|
gst_object_unref (input->parsebin);
|
||||||
|
gst_object_unref (input->parsebin_sink);
|
||||||
|
|
||||||
|
input->parsebin = NULL;
|
||||||
|
input->parsebin_sink = NULL;
|
||||||
|
|
||||||
|
if (!input->is_main) {
|
||||||
|
dbin->other_inputs = g_list_remove (dbin->other_inputs, input);
|
||||||
|
free_input_async (dbin, input);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
INPUT_UNLOCK (dbin);
|
INPUT_UNLOCK (dbin);
|
||||||
return;
|
return;
|
||||||
|
@ -839,6 +852,14 @@ free_input (GstDecodebin3 * dbin, DecodebinInput * input)
|
||||||
g_free (input);
|
g_free (input);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
free_input_async (GstDecodebin3 * dbin, DecodebinInput * input)
|
||||||
|
{
|
||||||
|
GST_LOG_OBJECT (dbin, "pushing input %p on thread pool to free", input);
|
||||||
|
gst_element_call_async (GST_ELEMENT_CAST (dbin),
|
||||||
|
(GstElementCallAsyncFunc) free_input, input, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
/* Call with INPUT_LOCK taken */
|
/* Call with INPUT_LOCK taken */
|
||||||
static DecodebinInput *
|
static DecodebinInput *
|
||||||
create_new_input (GstDecodebin3 * dbin, gboolean main)
|
create_new_input (GstDecodebin3 * dbin, gboolean main)
|
||||||
|
|
Loading…
Reference in a new issue