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

kayasrc: use grabber PixelFormat in case format conversion is being used

Browse Source
This commit is contained in:
Joshua M. Doe 2018-07-18 10:54:09 -04:00
parent 73725a57da
commit 760620b21a
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/kaya/gstkayasrc.c
View File

@ -380,7 +380,8 @@ gst_kayasrc_start (GstBaseSrc * bsrc)
FGSTATUS ret; FGSTATUS ret;
uint32_t i, num_ifaces, num_cameras = 0; uint32_t i, num_ifaces, num_cameras = 0;
guint32 width, height; guint32 width, height;
gchar *pixel_format; gchar camera_pixel_format[256], grabber_pixel_format[256];
guint32 str_size;
KY_DEVICE_INFO devinfo; KY_DEVICE_INFO devinfo;
KYFGCAMERA_INFO caminfo; KYFGCAMERA_INFO caminfo;
CAMHANDLE cam_handles[4] = { 0 }; CAMHANDLE cam_handles[4] = { 0 };
@ -521,13 +522,24 @@ gst_kayasrc_start (GstBaseSrc * bsrc)
KYFG_BufferQueueAll (src->stream_handle, KY_ACQ_QUEUE_UNQUEUED, KYFG_BufferQueueAll (src->stream_handle, KY_ACQ_QUEUE_UNQUEUED,
KY_ACQ_QUEUE_INPUT); KY_ACQ_QUEUE_INPUT);
width = (guint32) KYFG_GetCameraValueInt (src->cam_handle, "Width"); width = (guint32) KYFG_GetCameraValueInt (src->cam_handle, "Width");
height = (guint32) KYFG_GetCameraValueInt (src->cam_handle, "Height"); height = (guint32) KYFG_GetCameraValueInt (src->cam_handle, "Height");
ret = GST_DEBUG_OBJECT (src, "Camera resolution is %dx%d", width, height);
KYFG_GetCameraValueString (src->cam_handle, "PixelFormat", &pixel_format);
GST_DEBUG_OBJECT (src, "Camera is %dx%d, %s", width, height, pixel_format); str_size = sizeof (grabber_pixel_format);
ret = KYFG_GetGrabberValueStringCopy (src->cam_handle, "PixelFormat",
grabber_pixel_format, &str_size);
str_size = sizeof (camera_pixel_format);
ret = KYFG_GetCameraValueStringCopy (src->cam_handle, "PixelFormat",
camera_pixel_format, &str_size);
GST_DEBUG_OBJECT (src, "PixelFormat of camera is %s, grabber is %s",
camera_pixel_format, grabber_pixel_format);
/* check if PixelFormat is Normal, in which case we use camera value */
if (g_strcmp0 (grabber_pixel_format, "Normal") == 0) {
g_strlcpy (grabber_pixel_format, camera_pixel_format,
sizeof (grabber_pixel_format));
}
/* create caps */ /* create caps */
if (src->caps) { if (src->caps) {
@ -536,12 +548,13 @@ gst_kayasrc_start (GstBaseSrc * bsrc)
} }
src->caps = src->caps =
gst_genicam_pixel_format_caps_from_pixel_format (pixel_format, gst_genicam_pixel_format_caps_from_pixel_format (grabber_pixel_format,
G_BYTE_ORDER, width, height, 30, 1, 1, 1); G_BYTE_ORDER, width, height, 30, 1, 1, 1);
if (src->caps == NULL) { if (src->caps == NULL) {
GST_ELEMENT_ERROR (src, STREAM, WRONG_TYPE, GST_ELEMENT_ERROR (src, STREAM, WRONG_TYPE,
("Unknown or unsupported pixel format '%s'.", pixel_format), (NULL)); ("Unknown or unsupported pixel format '%s'.", grabber_pixel_format),
(NULL));
return FALSE; return FALSE;
} }