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

niimaqsrc: Output caps supports both actual bpp and bpp=16

Browse Source 
The src caps now have two structures, the first contains the actual bpp of the camera, (10, 12, or 14), and the second has the standard bpp=16. This enables the element to be used both with ffmpegcolorspace (and other elements which only accept bpp=16) but also with our elements like videolevels.
This commit is contained in:
Joshua M. Doe 2010-04-22 14:19:38 -04:00
parent 54ee4258a0
commit bfdbf89aa8
1 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sys/gstniimaq.c
View File

@ -446,9 +446,6 @@ gst_niimaqsrc_init (GstNiImaqSrc * src, GstNiImaqSrcClass * g_class)
/* set source as live (no preroll) */ /* set source as live (no preroll) */
gst_base_src_set_live (GST_BASE_SRC (src), TRUE); gst_base_src_set_live (GST_BASE_SRC (src), TRUE);
/* force pad to only accept fixed caps */
gst_pad_use_fixed_caps (srcpad);
/* initialize member variables */ /* initialize member variables */
src->timestamp_offset = 0; src->timestamp_offset = 0;
src->caps = NULL; src->caps = NULL;
@ -821,18 +818,15 @@ gst_niimaqsrc_get_cam_caps (GstNiImaqSrc * src)
} }
/* retrieve caps from IMAQ interface */ /* retrieve caps from IMAQ interface */
rval = imgGetAttribute(src->iid, IMG_ATTR_BITSPERPIXEL, &val); rval = imgGetAttribute (src->iid, IMG_ATTR_BITSPERPIXEL, &val);
bpp = val; bpp = val;
rval &= imgGetAttribute(src->iid, IMG_ATTR_BYTESPERPIXEL, &val); rval &= imgGetAttribute (src->iid, IMG_ATTR_BYTESPERPIXEL, &val);
depth = val*8; depth = val*8;
rval &= imgGetAttribute(src->iid, IMG_ATTR_ROI_WIDTH, &val); rval &= imgGetAttribute (src->iid, IMG_ATTR_ROI_WIDTH, &val);
width = val; width = val;
rval &= imgGetAttribute(src->iid, IMG_ATTR_ROI_HEIGHT, &val); rval &= imgGetAttribute (src->iid, IMG_ATTR_ROI_HEIGHT, &val);
height = val; height = val;
/* TODO: support both actual bpp and bpp=16 */
bpp = depth;
if (rval) { if (rval) {
GST_ELEMENT_ERROR (src, STREAM, FAILED, GST_ELEMENT_ERROR (src, STREAM, FAILED,
("attempt to read attributes failed"), ("attempt to read attributes failed"),
@ -842,26 +836,25 @@ gst_niimaqsrc_get_cam_caps (GstNiImaqSrc * src)
/* create new structure and set caps we got from IMAQ */ /* create new structure and set caps we got from IMAQ */
gs = gst_structure_empty_new ("video"); gs = gst_structure_empty_new ("video");
if (!gst_niimaqsrc_set_caps_color(gs, bpp, depth) || if (!gst_niimaqsrc_set_caps_color (gs, bpp, depth) ||
!gst_niimaqsrc_set_caps_framesize(gs, width, height)) { !gst_niimaqsrc_set_caps_framesize (gs, width, height)) {
GST_ELEMENT_ERROR (src, STREAM, FAILED, GST_ELEMENT_ERROR (src, STREAM, FAILED,
("attempt to set caps %dx%dx%d (%d) failed", width,height,depth, bpp), ("attempt to set caps %dx%dx%d (%d) failed", width, height, depth, bpp),
("attempt to set caps %dx%dx%d (%d) failed", width,height,depth, bpp)); ("attempt to set caps %dx%dx%d (%d) failed", width, height, depth, bpp));
goto error; goto error;
} }
/* hard code framerate to 30Hz as IMAQ doesn't tell us anything about it */ /* hard code framerate to 30Hz as IMAQ doesn't tell us anything about it */
gst_structure_set(gs, "framerate", GST_TYPE_FRACTION, 30, 1, NULL); gst_structure_set (gs, "framerate", GST_TYPE_FRACTION, 30, 1, NULL);
gst_caps_append_structure (gcaps, gst_structure_copy (gs)); gst_caps_append_structure (gcaps, gst_structure_copy (gs));
/* if (8 < bpp < 16), then append structure with bpp=16 so ffmpegcolorspace /* if (8 < bpp < 16), then append structure with bpp=16 so ffmpegcolorspace
* and other elements can work directly with this src */ * and other elements can work directly with this src */
/* TODO: support both actual bpp (10,12,14) and 16 */ if (bpp > 8 && bpp < 16) {
/*if (bpp > 8) {
gst_niimaqsrc_set_caps_color (gs, 16, 16); gst_niimaqsrc_set_caps_color (gs, 16, 16);
gst_caps_append_structure (gcaps, gst_structure_copy (gs)); gst_caps_append_structure (gcaps, gst_structure_copy (gs));
}*/ }
gst_object_unref (gs); gst_object_unref (gs);
GST_DEBUG_OBJECT (gcaps, "are the camera caps"); GST_DEBUG_OBJECT (gcaps, "are the camera caps");
@ -929,14 +922,6 @@ gst_niimaqsrc_start (GstBaseSrc * src)
("Failed to get caps from IMAQ")); ("Failed to get caps from IMAQ"));
goto error; goto error;
} }
pad = gst_element_get_static_pad (GST_ELEMENT (src), "src");
ret = gst_pad_set_caps (pad, gst_caps_copy (filter->caps));
gst_object_unref (pad);
if (!ret) {
GST_ELEMENT_ERROR (filter, RESOURCE, FAILED, ("Failed set caps to src pad"),
("Failed set caps to src pad"));
goto error;
}
GST_LOG_OBJECT (filter, "Creating ring with %d buffers", filter->bufsize); GST_LOG_OBJECT (filter, "Creating ring with %d buffers", filter->bufsize);