mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 07:47:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

encodebin: Also lock input caps when dynamic output is disabled

Browse source 
With the way caps negotiation work in encoders, the only way to ensure
that no downstream renegotiation is done in the encoder is to also lock
upstream caps. Anyway with the current behavior upstream of encoders
*require* to handle any file format so locking upstream format should
be safe.

https://bugzilla.gnome.org/show_bug.cgi?id=795464
This commit is contained in:
Thibault Saunier 2018-04-22 10:49:29 -03:00
parent 46c024ea3d
commit 9ce8cf89ba
1 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gst/encoding/gstencodebin.c
View file

@ -202,6 +202,7 @@ struct _StreamGroup
GstElement *splitter; GstElement *splitter;
GList *converters; /* List of conversion GstElement */ GList *converters; /* List of conversion GstElement */
GstElement *capsfilter; /* profile->restriction (if non-NULL/ANY) */ GstElement *capsfilter; /* profile->restriction (if non-NULL/ANY) */
gulong inputfilter_caps_sid;
GstElement *encoder; /* Encoder (can be NULL) */ GstElement *encoder; /* Encoder (can be NULL) */
GstElement *fakesink; /* Fakesink (can be NULL) */ GstElement *fakesink; /* Fakesink (can be NULL) */
GstElement *combiner; GstElement *combiner;
@ -1118,21 +1119,21 @@ _profile_restriction_caps_cb (GstEncodingProfile * profile,
} }
static void static void
_outfilter_caps_set_cb (GstPad * outfilter_sinkpad, _capsfilter_force_format (GstPad * pad,
GParamSpec * arg G_GNUC_UNUSED, StreamGroup * group) GParamSpec * arg G_GNUC_UNUSED, gulong * signal_id)
{ {
GstCaps *caps; GstCaps *caps;
GstStructure *structure; GstStructure *structure;
g_object_get (outfilter_sinkpad, "caps", &caps, NULL); g_object_get (pad, "caps", &caps, NULL);
caps = gst_caps_copy (caps); caps = gst_caps_copy (caps);
structure = gst_caps_get_structure (caps, 0); structure = gst_caps_get_structure (caps, 0);
gst_structure_remove_field (structure, "streamheader"); gst_structure_remove_field (structure, "streamheader");
GST_INFO_OBJECT (group->ebin, "Forcing caps to %" GST_PTR_FORMAT, caps); GST_INFO_OBJECT (pad, "Forcing caps to %" GST_PTR_FORMAT, caps);
g_object_set (group->outfilter, "caps", caps, NULL); g_object_set (GST_OBJECT_PARENT (pad), "caps", caps, NULL);
g_signal_handler_disconnect (outfilter_sinkpad, group->outputfilter_caps_sid); g_signal_handler_disconnect (pad, *signal_id);
group->outputfilter_caps_sid = 0; *signal_id = 0;
gst_caps_unref (caps); gst_caps_unref (caps);
} }
@ -1146,7 +1147,8 @@ _set_group_caps_format (StreamGroup * sgroup, GstEncodingProfile * prof,
if (!sgroup->outputfilter_caps_sid) { if (!sgroup->outputfilter_caps_sid) {
sgroup->outputfilter_caps_sid = sgroup->outputfilter_caps_sid =
g_signal_connect (sgroup->outfilter->sinkpads->data, g_signal_connect (sgroup->outfilter->sinkpads->data,
"notify::caps", G_CALLBACK (_outfilter_caps_set_cb), sgroup); "notify::caps", G_CALLBACK (_capsfilter_force_format),
&sgroup->outputfilter_caps_sid);
} }
} }
} }
@ -1439,6 +1441,16 @@ _create_stream_group (GstEncodeBin * ebin, GstEncodingProfile * sprof,
last = sgroup->capsfilter = gst_element_factory_make ("capsfilter", NULL); last = sgroup->capsfilter = gst_element_factory_make ("capsfilter", NULL);
if (restriction && !gst_caps_is_any (restriction)) if (restriction && !gst_caps_is_any (restriction))
g_object_set (sgroup->capsfilter, "caps", restriction, NULL); g_object_set (sgroup->capsfilter, "caps", restriction, NULL);
if (!gst_encoding_profile_get_allow_dynamic_output (sprof)) {
if (!sgroup->inputfilter_caps_sid) {
sgroup->inputfilter_caps_sid =
g_signal_connect (sgroup->capsfilter->sinkpads->data,
"notify::caps", G_CALLBACK (_capsfilter_force_format),
&sgroup->inputfilter_caps_sid);
}
}
gst_bin_add ((GstBin *) ebin, sgroup->capsfilter); gst_bin_add ((GstBin *) ebin, sgroup->capsfilter);
tosync = g_list_append (tosync, sgroup->capsfilter); tosync = g_list_append (tosync, sgroup->capsfilter);
if (sgroup->encoder == NULL) { if (sgroup->encoder == NULL) {
@ -2105,6 +2117,12 @@ stream_group_free (GstEncodeBin * ebin, StreamGroup * sgroup)
gst_element_unlink (sgroup->capsfilter, sgroup->encoder); gst_element_unlink (sgroup->capsfilter, sgroup->encoder);
else else
gst_element_unlink (sgroup->capsfilter, sgroup->fakesink); gst_element_unlink (sgroup->capsfilter, sgroup->fakesink);
if (sgroup->inputfilter_caps_sid) {
g_signal_handler_disconnect (sgroup->capsfilter->sinkpads->data,
sgroup->inputfilter_caps_sid);
sgroup->inputfilter_caps_sid = 0;
}
gst_bin_remove ((GstBin *) ebin, sgroup->capsfilter); gst_bin_remove ((GstBin *) ebin, sgroup->capsfilter);
} }