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

camerabin2: Avoid assertions when plugin creation fails

Browse source 
Capsfilters are created on the constructor and their properties can
be set/get from camerabin2's set/get_property functions. The user with
a broken setup would cause assertions when trying to set/get the
capture caps of this camerabin2.

A proper missing-plugin message will be posted when the user tries to
set camerabin2 to READY state.
This commit is contained in:
Thiago Santos 2011-08-18 15:12:56 -03:00
parent fa6d174455
commit fe206e75f7
1 changed files with 47 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
gst/camerabin2/gstcamerabin2.c
View file

@ -1734,8 +1734,12 @@ gst_camera_bin_set_property (GObject * object, guint prop_id,
"Setting audio capture caps to %" GST_PTR_FORMAT, "Setting audio capture caps to %" GST_PTR_FORMAT,
gst_value_get_caps (value)); gst_value_get_caps (value));
if (G_LIKELY (camera->audio_capsfilter)) {
g_object_set (camera->audio_capsfilter, "caps", g_object_set (camera->audio_capsfilter, "caps",
gst_value_get_caps (value), NULL); gst_value_get_caps (value), NULL);
} else {
GST_WARNING_OBJECT (camera, "Audio capsfilter missing");
}
} }
break; break;
case PROP_IMAGE_CAPTURE_CAPS:{ case PROP_IMAGE_CAPTURE_CAPS:{
@ -1750,9 +1754,14 @@ gst_camera_bin_set_property (GObject * object, guint prop_id,
"Setting image capture caps to %" GST_PTR_FORMAT, "Setting image capture caps to %" GST_PTR_FORMAT,
gst_value_get_caps (value)); gst_value_get_caps (value));
/* set the capsfilter caps and notify the src to renegotiate */ if (G_LIKELY (camera->imagebin_capsfilter)) {
g_object_set (camera->imagebin_capsfilter, "caps", g_object_set (camera->imagebin_capsfilter, "caps",
gst_value_get_caps (value), NULL); gst_value_get_caps (value), NULL);
} else {
GST_WARNING_OBJECT (camera, "Image capsfilter missing");
}
/* set the capsfilter caps and notify the src to renegotiate */
if (pad) { if (pad) {
GST_DEBUG_OBJECT (camera, "Pushing renegotiate on %s", GST_DEBUG_OBJECT (camera, "Pushing renegotiate on %s",
GST_PAD_NAME (pad)); GST_PAD_NAME (pad));
@ -1774,8 +1783,13 @@ gst_camera_bin_set_property (GObject * object, guint prop_id,
gst_value_get_caps (value)); gst_value_get_caps (value));
/* set the capsfilter caps and notify the src to renegotiate */ /* set the capsfilter caps and notify the src to renegotiate */
if (G_LIKELY (camera->videobin_capsfilter)) {
g_object_set (camera->videobin_capsfilter, "caps", g_object_set (camera->videobin_capsfilter, "caps",
gst_value_get_caps (value), NULL); gst_value_get_caps (value), NULL);
} else {
GST_WARNING_OBJECT (camera, "Video capsfilter missing");
}
if (pad) { if (pad) {
GST_DEBUG_OBJECT (camera, "Pushing renegotiate on %s", GST_DEBUG_OBJECT (camera, "Pushing renegotiate on %s",
GST_PAD_NAME (pad)); GST_PAD_NAME (pad));
@ -1797,8 +1811,13 @@ gst_camera_bin_set_property (GObject * object, guint prop_id,
gst_value_get_caps (value)); gst_value_get_caps (value));
/* set the capsfilter caps and notify the src to renegotiate */ /* set the capsfilter caps and notify the src to renegotiate */
if (G_LIKELY (camera->viewfinderbin_capsfilter)) {
g_object_set (camera->viewfinderbin_capsfilter, "caps", g_object_set (camera->viewfinderbin_capsfilter, "caps",
gst_value_get_caps (value), NULL); gst_value_get_caps (value), NULL);
} else {
GST_WARNING_OBJECT (camera, "Viewfinder capsfilter missing");
}
if (pad) { if (pad) {
GST_DEBUG_OBJECT (camera, "Pushing renegotiate on %s", GST_DEBUG_OBJECT (camera, "Pushing renegotiate on %s",
GST_PAD_NAME (pad)); GST_PAD_NAME (pad));
@ -1970,28 +1989,44 @@ gst_camera_bin_get_property (GObject * object, guint prop_id,
break; break;
case PROP_AUDIO_CAPTURE_CAPS:{ case PROP_AUDIO_CAPTURE_CAPS:{
GstCaps *caps = NULL; GstCaps *caps = NULL;
if (G_LIKELY (camera->audio_capsfilter)) {
g_object_get (camera->audio_capsfilter, "caps", &caps, NULL); g_object_get (camera->audio_capsfilter, "caps", &caps, NULL);
} else {
GST_WARNING ("Missing audio capsfilter");
}
gst_value_set_caps (value, caps); gst_value_set_caps (value, caps);
gst_caps_unref (caps); gst_caps_unref (caps);
} }
break; break;
case PROP_IMAGE_CAPTURE_CAPS:{ case PROP_IMAGE_CAPTURE_CAPS:{
GstCaps *caps = NULL; GstCaps *caps = NULL;
if (G_LIKELY (camera->imagebin_capsfilter)) {
g_object_get (camera->imagebin_capsfilter, "caps", &caps, NULL); g_object_get (camera->imagebin_capsfilter, "caps", &caps, NULL);
} else {
GST_WARNING ("Missing imagebin capsfilter");
}
gst_value_set_caps (value, caps); gst_value_set_caps (value, caps);
gst_caps_unref (caps); gst_caps_unref (caps);
} }
break; break;
case PROP_VIDEO_CAPTURE_CAPS:{ case PROP_VIDEO_CAPTURE_CAPS:{
GstCaps *caps = NULL; GstCaps *caps = NULL;
if (G_LIKELY (camera->videobin_capsfilter)) {
g_object_get (camera->videobin_capsfilter, "caps", &caps, NULL); g_object_get (camera->videobin_capsfilter, "caps", &caps, NULL);
} else {
GST_WARNING ("Missing imagebin capsfilter");
}
gst_value_set_caps (value, caps); gst_value_set_caps (value, caps);
gst_caps_unref (caps); gst_caps_unref (caps);
} }
break; break;
case PROP_VIEWFINDER_CAPS:{ case PROP_VIEWFINDER_CAPS:{
GstCaps *caps = NULL; GstCaps *caps = NULL;
if (G_LIKELY (camera->viewfinderbin_capsfilter)) {
g_object_get (camera->viewfinderbin_capsfilter, "caps", &caps, NULL); g_object_get (camera->viewfinderbin_capsfilter, "caps", &caps, NULL);
} else {
GST_WARNING ("Missing imagebin capsfilter");
}
gst_value_set_caps (value, caps); gst_value_set_caps (value, caps);
gst_caps_unref (caps); gst_caps_unref (caps);
} }