From 530fd119a508688a039967166627f4bd351c9295 Mon Sep 17 00:00:00 2001
From: "Joshua M. Doe" <oss@nvl.army.mil>
Date: Thu, 12 Dec 2013 09:40:01 -0500
Subject: [PATCH] euresyssrc: add color-format property

---
 sys/euresys/gsteuresyssrc.c | 44 ++++++++++++++++++++++++++++++++-----
 sys/euresys/gsteuresyssrc.h |  3 +++
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/sys/euresys/gsteuresyssrc.c b/sys/euresys/gsteuresyssrc.c
index a04834e..548fdee 100644
--- a/sys/euresys/gsteuresyssrc.c
+++ b/sys/euresys/gsteuresyssrc.c
@@ -70,12 +70,14 @@ enum
   PROP_0,
   PROP_BOARD_INDEX,
   PROP_CAMERA_TYPE,
-  PROP_CONNECTOR
+  PROP_CONNECTOR,
+  PROP_COLOR_FORMAT
 };
 
 #define DEFAULT_PROP_BOARD_INDEX 0
 #define DEFAULT_PROP_CAMERA_TYPE  MC_Camera_CAMERA_NTSC
 #define DEFAULT_PROP_CONNECTOR  MC_Connector_VID1
+#define DEFAULT_PROP_COLOR_FORMAT MC_ColorFormat_Y8
 
 /* pad templates */
 
@@ -138,6 +140,26 @@ gst_euresys_connector_get_type (void)
   return euresys_connector_type;
 }
 
+#define GST_TYPE_EURESYS_COLOR_FORMAT (gst_euresys_color_format_get_type())
+static GType
+gst_euresys_color_format_get_type (void)
+{
+  static GType euresys_color_format_type = 0;
+  static const GEnumValue euresys_color_format[] = {
+    {MC_ColorFormat_RGB24, "RGB24", "RGB24"},
+    {MC_ColorFormat_RGB32, "RGB32", "RGB32"},
+    {MC_ColorFormat_Y8, "Y8", "Monochrome 8-bit"},
+    {MC_ColorFormat_ARGB32, "ARGB32", "ARGB32"},
+    {0, NULL, NULL},
+  };
+
+  if (!euresys_color_format_type) {
+    euresys_color_format_type =
+        g_enum_register_static ("GstEuresysColorFormat", euresys_color_format);
+  }
+  return euresys_color_format_type;
+}
+
 #define GST_TYPE_EURESYS_CAMERA (gst_euresys_camera_get_type())
 static GType
 gst_euresys_camera_get_type (void)
@@ -251,6 +273,12 @@ gst_euresys_class_init (GstEuresysClass * klass)
           DEFAULT_PROP_CONNECTOR,
           G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE |
           GST_PARAM_MUTABLE_READY));
+  g_object_class_install_property (gobject_class, PROP_COLOR_FORMAT,
+      g_param_spec_enum ("color-format", "Color format",
+          "Color format of the camera", GST_TYPE_EURESYS_COLOR_FORMAT,
+          DEFAULT_PROP_COLOR_FORMAT,
+          G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE |
+          GST_PARAM_MUTABLE_READY));
 
   gst_element_class_add_pad_template (gstelement_class,
       gst_static_pad_template_get (&gst_euresys_src_template));
@@ -281,6 +309,7 @@ gst_euresys_init (GstEuresys * euresys)
   euresys->boardIdx = DEFAULT_PROP_BOARD_INDEX;
   euresys->cameraType = DEFAULT_PROP_CAMERA_TYPE;
   euresys->connector = DEFAULT_PROP_CONNECTOR;
+  euresys->colorFormat = DEFAULT_PROP_COLOR_FORMAT;
 
   euresys->hChannel = 0;
 
@@ -309,6 +338,9 @@ gst_euresys_set_property (GObject * object, guint property_id,
     case PROP_CONNECTOR:
       euresys->connector = g_value_get_enum (value);
       break;
+    case PROP_COLOR_FORMAT:
+      euresys->colorFormat = g_value_get_enum (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -334,6 +366,9 @@ gst_euresys_get_property (GObject * object, guint property_id,
     case PROP_CONNECTOR:
       g_value_set_enum (value, euresys->connector);
       break;
+    case PROP_COLOR_FORMAT:
+      g_value_get_enum (value, euresys->colorFormat);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -416,14 +451,13 @@ gst_euresys_start (GstBaseSrc * bsrc)
   }
 
   /* Set the color format */
-  /* TODO: i don't think this should be needed right now */
-/*
-  status = McSetParamInt (euresys->hChannel, MC_ColorFormat, MC_ColorFormat_Y8);
+  status =
+      McSetParamInt (euresys->hChannel, MC_ColorFormat, euresys->colorFormat);
   if (status != MC_OK) {
     GST_ELEMENT_ERROR (euresys, RESOURCE, SETTINGS,
         (("Failed to set color format = %d."), MC_ColorFormat_Y8), (NULL));
     goto error;
-  }*/
+  }
 
   /* Acquire images continuously */
   status = McSetParamInt (euresys->hChannel, MC_SeqLength_Fr, MC_INDETERMINATE);
diff --git a/sys/euresys/gsteuresyssrc.h b/sys/euresys/gsteuresyssrc.h
index 861fc61..fda7f56 100644
--- a/sys/euresys/gsteuresyssrc.h
+++ b/sys/euresys/gsteuresyssrc.h
@@ -56,9 +56,12 @@ struct _GstEuresys
   INT32 last_time_code;
   MCHANDLE hChannel;
   INT32 boardType;
+
+  /* properties */
   INT32 boardIdx;
   INT32 cameraType;
   INT32 connector;
+  INT32 colorFormat;
 };
 
 struct _GstEuresysClass