From bfdbf89aa81cf18c9a09c27f9cc963b597684fa1 Mon Sep 17 00:00:00 2001
From: "Joshua M. Doe" <oss@nvl.army.mil>
Date: Thu, 22 Apr 2010 14:19:38 -0400
Subject: [PATCH] niimaqsrc: Output caps supports both actual bpp and bpp=16

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.
---
 sys/gstniimaq.c | 37 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/sys/gstniimaq.c b/sys/gstniimaq.c
index d70a3b9..a65c4fd 100644
--- a/sys/gstniimaq.c
+++ b/sys/gstniimaq.c
@@ -446,9 +446,6 @@ gst_niimaqsrc_init (GstNiImaqSrc * src, GstNiImaqSrcClass * g_class)
   /* set source as live (no preroll) */
   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 */
   src->timestamp_offset = 0;
   src->caps = NULL;
@@ -821,18 +818,15 @@ gst_niimaqsrc_get_cam_caps (GstNiImaqSrc * src)
   }
 
   /* retrieve caps from IMAQ interface */
-  rval = imgGetAttribute(src->iid, IMG_ATTR_BITSPERPIXEL, &val);
+  rval = imgGetAttribute (src->iid, IMG_ATTR_BITSPERPIXEL, &val);
   bpp = val;
-  rval &= imgGetAttribute(src->iid, IMG_ATTR_BYTESPERPIXEL, &val);
+  rval &= imgGetAttribute (src->iid, IMG_ATTR_BYTESPERPIXEL, &val);
   depth = val*8;
-  rval &= imgGetAttribute(src->iid, IMG_ATTR_ROI_WIDTH, &val);
+  rval &= imgGetAttribute (src->iid, IMG_ATTR_ROI_WIDTH, &val);
   width = val;
-  rval &= imgGetAttribute(src->iid, IMG_ATTR_ROI_HEIGHT, &val);
+  rval &= imgGetAttribute (src->iid, IMG_ATTR_ROI_HEIGHT, &val);
   height = val;
 
-  /* TODO: support both actual bpp and bpp=16 */
-  bpp = depth;
-
   if (rval) {
     GST_ELEMENT_ERROR (src, STREAM, 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 */
   gs = gst_structure_empty_new ("video");
-  if (!gst_niimaqsrc_set_caps_color(gs, bpp, depth) ||
-    !gst_niimaqsrc_set_caps_framesize(gs, width, height)) {
+  if (!gst_niimaqsrc_set_caps_color (gs, bpp, depth) ||
+    !gst_niimaqsrc_set_caps_framesize (gs, width, height)) {
     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;
   }
 
   /* 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));
 
   /* if (8 < bpp < 16), then append structure with bpp=16 so ffmpegcolorspace
    * and other elements can work directly with this src */
-  /* TODO: support both actual bpp (10,12,14) and 16 */
-  /*if (bpp > 8) {
+  if (bpp > 8 && bpp < 16) {
     gst_niimaqsrc_set_caps_color (gs, 16, 16);
     gst_caps_append_structure (gcaps, gst_structure_copy (gs));
-  }*/
+  }
   gst_object_unref (gs);
 
   GST_DEBUG_OBJECT (gcaps, "are the camera caps");
@@ -929,14 +922,6 @@ gst_niimaqsrc_start (GstBaseSrc * src)
       ("Failed to get caps from IMAQ"));
     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);