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

idsueyesrc: use AOI size instead of max image size

Browse Source
This commit is contained in:
Joshua M. Doe 2017-03-08 15:16:04 -05:00
parent 5683db6168
commit c273d3dd2f
1 changed files with 13 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
sys/idsueye/gstidsueyesrc.c
View File

@ -268,37 +268,6 @@ gst_idsueyesrc_finalize (GObject * object)
} }
static void
gst_idsueyesrc_get_image_size (GstIdsueyeSrc * src, gint * width, gint * height)
{
/* Check if the camera supports an arbitrary AOI
Only the ueye xs does not support an arbitrary AOI */
INT nAOISupported = 0;
BOOL bAOISupported = TRUE;
if (is_ImageFormat (src->hCam, IMGFRMT_CMD_GET_ARBITRARY_AOI_SUPPORTED,
(void *) &nAOISupported, sizeof (nAOISupported)) == IS_SUCCESS) {
bAOISupported = (nAOISupported != 0);
}
if (bAOISupported) {
/* All other sensors get maximum image size */
SENSORINFO sInfo;
is_GetSensorInfo (src->hCam, &sInfo);
*width = sInfo.nMaxWidth;
*height = sInfo.nMaxHeight;
} else {
/* Only ueye xs
Get image size of the current format */
IS_SIZE_2D imageSize;
is_AOI (src->hCam, IS_AOI_IMAGE_GET_SIZE, (void *) &imageSize,
sizeof (imageSize));
*width = imageSize.s32Width;
*height = imageSize.s32Height;
}
}
static void static void
gst_idsueyesrc_set_caps_from_camera (GstIdsueyeSrc * src) gst_idsueyesrc_set_caps_from_camera (GstIdsueyeSrc * src)
{ {
@ -306,6 +275,8 @@ gst_idsueyesrc_set_caps_from_camera (GstIdsueyeSrc * src)
gint idsColorMode; gint idsColorMode;
GstVideoFormat videoFormat = GST_VIDEO_FORMAT_UNKNOWN; GstVideoFormat videoFormat = GST_VIDEO_FORMAT_UNKNOWN;
GstVideoInfo vinfo; GstVideoInfo vinfo;
IS_SIZE_2D imageSize;
INT ret;
if (src->caps) { if (src->caps) {
gst_caps_unref (src->caps); gst_caps_unref (src->caps);
@ -343,6 +314,17 @@ gst_idsueyesrc_set_caps_from_camera (GstIdsueyeSrc * src)
return; return;
} }
ret = is_AOI (src->hCam, IS_AOI_IMAGE_GET_SIZE, (void *) &imageSize,
sizeof (imageSize));
if (ret != IS_SUCCESS) {
GST_ELEMENT_ERROR (src, STREAM, WRONG_TYPE,
("Failed to query AOI size"), (NULL));
return;
}
src->width = imageSize.s32Width;
src->height = imageSize.s32Height;
gst_video_info_init (&vinfo); gst_video_info_init (&vinfo);
vinfo.width = src->width; vinfo.width = src->width;
vinfo.height = src->height; vinfo.height = src->height;
@ -405,7 +387,6 @@ gst_idsueyesrc_start (GstBaseSrc * bsrc)
{ {
GstIdsueyeSrc *src = GST_IDSUEYE_SRC (bsrc); GstIdsueyeSrc *src = GST_IDSUEYE_SRC (bsrc);
INT ret; INT ret;
IS_SIZE_2D imageSize;
INT numCameras; INT numCameras;
GST_DEBUG_OBJECT (src, "start"); GST_DEBUG_OBJECT (src, "start");
@ -470,14 +451,6 @@ gst_idsueyesrc_start (GstBaseSrc * bsrc)
} }
} }
gst_idsueyesrc_get_image_size (src, &src->width, &src->height);
imageSize.s32Width = src->width;
imageSize.s32Height = src->height;
ret =
is_AOI (src->hCam, IS_AOI_IMAGE_SET_SIZE, (void *) &imageSize,
sizeof (imageSize));
gst_idsueyesrc_set_caps_from_camera (src); gst_idsueyesrc_set_caps_from_camera (src);
if (!src->caps) { if (!src->caps) {
return FALSE; return FALSE;