mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-19 14:56:36 +00:00
pad: don't intersect with any in proxy_pad_get_caps
We initialize the caps with any and if a pad has NULL caps, just skip it instead of intersecting with any. Also add branch prediction here.
This commit is contained in:
parent
b1f88b3f1f
commit
82526701f0
1 changed files with 6 additions and 6 deletions
|
@ -2630,16 +2630,16 @@ static gboolean
|
|||
intersect_caps_func (GstPad * pad, GValue * ret, GstPad * orig)
|
||||
{
|
||||
/* skip the pad, the request came from */
|
||||
if (pad != orig) {
|
||||
if (G_UNLIKELY (pad != orig)) {
|
||||
GstCaps *peercaps, *existing;
|
||||
|
||||
existing = g_value_get_pointer (ret);
|
||||
peercaps = gst_pad_peer_get_caps (pad);
|
||||
if (peercaps == NULL)
|
||||
peercaps = gst_caps_new_any ();
|
||||
g_value_set_pointer (ret, gst_caps_intersect (existing, peercaps));
|
||||
gst_caps_unref (existing);
|
||||
gst_caps_unref (peercaps);
|
||||
if (G_UNLIKELY (peercaps)) {
|
||||
g_value_set_pointer (ret, gst_caps_intersect (existing, peercaps));
|
||||
gst_caps_unref (existing);
|
||||
gst_caps_unref (peercaps);
|
||||
}
|
||||
}
|
||||
gst_object_unref (pad);
|
||||
return TRUE;
|
||||
|
|
Loading…
Reference in a new issue