mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-03 10:43:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

wrappercamerabinsrc: avoid assertion by using null caps as any

Browse source 
NULL caps aren't valid caps, use a reference to 'any' caps
This commit is contained in:
Thiago Santos 2012-05-02 15:35:05 -03:00
parent cc09cd1303
commit 37bac4c1ed
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/camerabin2/gstwrappercamerabinsrc.c
View file

@ -792,7 +792,9 @@ gst_wrapper_camera_bin_src_set_mode (GstBaseCameraSrc * bcamsrc,
g_object_set (G_OBJECT (photography), "capture-mode", mode, NULL); g_object_set (G_OBJECT (photography), "capture-mode", mode, NULL);
} }
} else { } else {
gst_wrapper_camera_bin_reset_video_src_caps (self, NULL); GstCaps *anycaps = gst_caps_new_any ();
gst_wrapper_camera_bin_reset_video_src_caps (self, anycaps);
gst_caps_unref (anycaps);
} }
return TRUE; return TRUE;
@ -1002,8 +1004,9 @@ gst_wrapper_camera_bin_src_start_capture (GstBaseCameraSrc * camerasrc)
GstCaps *caps = NULL; GstCaps *caps = NULL;
if (src->video_renegotiate) { if (src->video_renegotiate) {
GstCaps *anycaps = gst_caps_new_any ();
g_mutex_unlock (&camerasrc->capturing_mutex); g_mutex_unlock (&camerasrc->capturing_mutex);
gst_wrapper_camera_bin_reset_video_src_caps (src, NULL); gst_wrapper_camera_bin_reset_video_src_caps (src, anycaps);
g_mutex_lock (&camerasrc->capturing_mutex); g_mutex_lock (&camerasrc->capturing_mutex);
/* clean capsfilter caps so they don't interfere here */ /* clean capsfilter caps so they don't interfere here */
@ -1020,6 +1023,7 @@ gst_wrapper_camera_bin_src_start_capture (GstBaseCameraSrc * camerasrc)
gst_wrapper_camera_bin_reset_video_src_caps (src, caps); gst_wrapper_camera_bin_reset_video_src_caps (src, caps);
g_mutex_lock (&camerasrc->capturing_mutex); g_mutex_lock (&camerasrc->capturing_mutex);
gst_caps_unref (caps); gst_caps_unref (caps);
gst_caps_unref (anycaps);
} }
if (src->video_rec_status == GST_VIDEO_RECORDING_STATUS_DONE) { if (src->video_rec_status == GST_VIDEO_RECORDING_STATUS_DONE) {
src->video_rec_status = GST_VIDEO_RECORDING_STATUS_STARTING; src->video_rec_status = GST_VIDEO_RECORDING_STATUS_STARTING;