mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 12:49:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

playsink: warn if a custom sink is set that has no 'sink' pad

Browse source
This commit is contained in:
Jan Schmidt 2016-11-17 00:40:43 +11:00
parent e740103669
commit 8a20b06e0b
1 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gst/playback/gstplaysink.c
View file

@ -856,6 +856,10 @@ gst_play_sink_set_sink (GstPlaySink * playsink, GstPlaySinkType type,
GstElement * sink) GstElement * sink)
{ {
GstElement **elem = NULL, *old = NULL; GstElement **elem = NULL, *old = NULL;
#ifndef GST_DISABLE_GST_DEBUG
GstPad *sink_pad;
const gchar *sink_type = NULL;
#endif
GST_LOG ("Setting sink %" GST_PTR_FORMAT " as sink type %d", sink, type); GST_LOG ("Setting sink %" GST_PTR_FORMAT " as sink type %d", sink, type);
@ -864,13 +868,22 @@ gst_play_sink_set_sink (GstPlaySink * playsink, GstPlaySinkType type,
case GST_PLAY_SINK_TYPE_AUDIO: case GST_PLAY_SINK_TYPE_AUDIO:
case GST_PLAY_SINK_TYPE_AUDIO_RAW: case GST_PLAY_SINK_TYPE_AUDIO_RAW:
elem = &playsink->audio_sink; elem = &playsink->audio_sink;
#ifndef GST_DISABLE_GST_DEBUG
sink_type = "audio";
#endif
break; break;
case GST_PLAY_SINK_TYPE_VIDEO: case GST_PLAY_SINK_TYPE_VIDEO:
case GST_PLAY_SINK_TYPE_VIDEO_RAW: case GST_PLAY_SINK_TYPE_VIDEO_RAW:
elem = &playsink->video_sink; elem = &playsink->video_sink;
#ifndef GST_DISABLE_GST_DEBUG
sink_type = "video";
#endif
break; break;
case GST_PLAY_SINK_TYPE_TEXT: case GST_PLAY_SINK_TYPE_TEXT:
elem = &playsink->text_sink; elem = &playsink->text_sink;
#ifndef GST_DISABLE_GST_DEBUG
sink_type = "text";
#endif
break; break;
default: default:
break; break;
@ -883,6 +896,19 @@ gst_play_sink_set_sink (GstPlaySink * playsink, GstPlaySinkType type,
} }
GST_PLAY_SINK_UNLOCK (playsink); GST_PLAY_SINK_UNLOCK (playsink);
#ifndef GST_DISABLE_GST_DEBUG
/* Check and warn if an application sets a sink with no 'sink' pad */
if (sink && elem) {
if ((sink_pad = gst_element_get_static_pad (sink, "sink")) != NULL) {
gst_object_unref (sink_pad);
} else {
GST_ELEMENT_WARNING (playsink, CORE, FAILED,
("Application error - playback can't work"),
("custom %s sink has no pad named \"sink\"", sink_type));
}
}
#endif
if (old) { if (old) {
/* Set the old sink to NULL if it is not used any longer */ /* Set the old sink to NULL if it is not used any longer */
if (old != sink && !GST_OBJECT_PARENT (old)) if (old != sink && !GST_OBJECT_PARENT (old))