yair/gst-plugin-linescan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

niimaqsrc: always return valid caps in get_caps

Browse Source 
Return template caps if actual camera caps aren't known yet. Previously resulted in an assertion.
This commit is contained in:
Joshua M. Doe 2010-04-23 10:34:06 -04:00
parent 9b78e8c0f9
commit 666edbe598
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/gstniimaq.c
View File

@ -555,7 +555,10 @@ gst_niimaqsrc_get_caps (GstBaseSrc * bsrc)
GST_DEBUG_OBJECT (bsrc, "Entering function get_caps"); GST_DEBUG_OBJECT (bsrc, "Entering function get_caps");
g_return_val_if_fail (gsrc->caps, NULL); /* return template caps if we don't know the actual camera caps */
if (!gsrc->caps) {
return gst_caps_copy (gst_pad_get_pad_template_caps (GST_BASE_SRC_PAD (gsrc)));
}
return gst_caps_copy (gsrc->caps); return gst_caps_copy (gsrc->caps);
} }
@ -1032,6 +1035,9 @@ gst_niimaqsrc_stop (GstBaseSrc * src)
GST_DEBUG_OBJECT (filter, "IMAQ interface closed"); GST_DEBUG_OBJECT (filter, "IMAQ interface closed");
gst_caps_unref (filter->caps);
filter->caps = NULL;
return TRUE; return TRUE;
} }