FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

camerabin: use gst_caps_replace instead of separate calls

Browse Source 
This fixes setting snapshot caps back to NULL also.
This commit is contained in:
Stefan Kost 2009-07-17 15:45:32 +03:00
parent b1d353e2de
commit 4ef918df28
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gst/camerabin/gstcamerabin.c
View File

@ -2862,12 +2862,8 @@ gst_camerabin_set_property (GObject * object, guint prop_id,
break; break;
case ARG_FILTER_CAPS: case ARG_FILTER_CAPS:
GST_OBJECT_LOCK (camera); GST_OBJECT_LOCK (camera);
if (camera->view_finder_caps) { gst_caps_replace (&camera->view_finder_caps,
gst_caps_unref (camera->view_finder_caps); (GstCaps *) gst_value_get_caps (value));
}
/* just ref, we don't modify it inplace */
camera->view_finder_caps =
gst_caps_ref ((GstCaps *) gst_value_get_caps (value));
GST_OBJECT_UNLOCK (camera); GST_OBJECT_UNLOCK (camera);
if (GST_STATE (camera) != GST_STATE_NULL) { if (GST_STATE (camera) != GST_STATE_NULL) {
gst_camerabin_set_capsfilter_caps (camera, camera->view_finder_caps); gst_camerabin_set_capsfilter_caps (camera, camera->view_finder_caps);
@ -2875,10 +2871,8 @@ gst_camerabin_set_property (GObject * object, guint prop_id,
break; break;
case ARG_PREVIEW_CAPS: case ARG_PREVIEW_CAPS:
GST_OBJECT_LOCK (camera); GST_OBJECT_LOCK (camera);
if (camera->preview_caps) { gst_caps_replace (&camera->preview_caps,
gst_caps_unref (camera->preview_caps); (GstCaps *) gst_value_get_caps (value));
}
camera->preview_caps = gst_caps_copy (gst_value_get_caps (value));
GST_OBJECT_UNLOCK (camera); GST_OBJECT_UNLOCK (camera);
gst_camerabin_preview_create_pipeline (camera); gst_camerabin_preview_create_pipeline (camera);
break; break;