mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-01 04:10:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

playsink: handle NULL ghost pad target

Browse source 
For the src pad anyway.

https://bugzilla.gnome.org/show_bug.cgi?id=661262
This commit is contained in:
Vincent Penquerc'h 2011-10-07 11:16:44 +00:00 committed by Sebastian Dröge
parent a583b63722
commit 2b84b328b1
2 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst/playback/gstplaysinkaudioconvert.c
View file

@ -352,17 +352,27 @@ gst_play_sink_audio_convert_getcaps (GstPad * pad)
GST_PLAY_SINK_AUDIO_CONVERT_LOCK (self);
otherpad = gst_ghost_pad_get_target (GST_GHOST_PAD_CAST (pad));
if (!otherpad) {
if (pad == self->srcpad) {
otherpad = self->sink_proxypad;
}
/* no equivalent for the sink pad */
}
GST_PLAY_SINK_AUDIO_CONVERT_UNLOCK (self);
peer = gst_pad_get_peer (otherpad);
if (peer) {
ret = gst_pad_get_caps_reffed (peer);
gst_object_unref (peer);
if (otherpad) {
peer = gst_pad_get_peer (otherpad);
if (peer) {
ret = gst_pad_get_caps_reffed (peer);
gst_object_unref (peer);
} else {
ret = gst_caps_new_any ();
}
gst_object_unref (otherpad);
} else {
GST_WARNING_OBJECT (self, "Could not traverse bin");
ret = gst_caps_new_any ();
}
gst_object_unref (otherpad);
gst_object_unref (self);
return ret;

21
gst/playback/gstplaysinkvideoconvert.c
View file

@ -332,17 +332,28 @@ gst_play_sink_video_convert_getcaps (GstPad * pad)
GST_PLAY_SINK_VIDEO_CONVERT_LOCK (self);
otherpad = gst_ghost_pad_get_target (GST_GHOST_PAD_CAST (pad));
if (!otherpad) {
if (pad == self->srcpad) {
otherpad = self->sink_proxypad;
}
/* no equivalent for the sink pad */
}
GST_PLAY_SINK_VIDEO_CONVERT_UNLOCK (self);
peer = gst_pad_get_peer (otherpad);
if (peer) {
ret = gst_pad_get_caps_reffed (peer);
gst_object_unref (peer);
if (otherpad) {
peer = gst_pad_get_peer (otherpad);
if (peer) {
ret = gst_pad_get_caps_reffed (peer);
gst_object_unref (peer);
} else {
ret = gst_caps_new_any ();
}
gst_object_unref (otherpad);
} else {
GST_WARNING_OBJECT (self, "Could not traverse bin");
ret = gst_caps_new_any ();
}
gst_object_unref (otherpad);
gst_object_unref (self);
return ret;