Added backlight compensation to windows

openpnp · Jan 7, 2018 · d041db5 · d041db5
1 parent f5d21c0
commit d041db5
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/include/openpnp-capture.h b/include/openpnp-capture.h
@@ -83,8 +83,7 @@ typedef uint32_t CapFormatID; ///< format identifier 0 .. numFormats
 #define CAPPROPID_HUE 10
 #define CAPPROPID_SHARPNESS 11
 #define CAPPROPID_BACKLIGHTCOMP 12
-#define CAPPROPID_COLORENABLE 13
-#define CAPPROPID_LAST 14
+#define CAPPROPID_LAST 13
 
 typedef uint32_t CapPropertyID; ///< property ID (exposure, zoom, focus etc.)
 

diff --git a/linux/platformstream.cpp b/linux/platformstream.cpp
@@ -652,8 +652,6 @@ bool PlatformStream::setProperty(uint32_t propID, int32_t value)
  case CAPPROPID_BACKLIGHTCOMP:
  ctrl.id = V4L2_CID_BACKLIGHT_COMPENSATION;
  break;
- // CAPPROPID_COLORENABLE is probably the same as V4L2_CID_COLOR_KILLER
- // but that is a boolean -- do we need special handling of this?
  default:
  return false;
  }

diff --git a/mac/uvcctrl.mm b/mac/uvcctrl.mm
@@ -54,9 +54,11 @@ of this software and associated documentation files (the "Software"), to deal
 #define CT_ZOOM_RELATIVE_CONTROL 0x0C
 
 // Processing unit control selectors
+#define PU_BACKLIGHT_COMPENSATION_CONTROL 0x01
 #define PU_BRIGHTNESS_CONTROL 0x02
 #define PU_CONTRAST_CONTROL 0x03
 #define PU_GAIN_CONTROL 0x04
+#define PU_POWER_LINE_FREQUENCY_CONTROL 0x05
 #define PU_HUE_CONTROL 0x06
 #define PU_SATURATION_CONTROL 0x07
 #define PU_SHARPNESS_CONTROL 0x08
@@ -98,6 +100,9 @@ of this software and associated documentation files (the "Software"), to deal
  uint32_t length; // length (bytes)
 };
 
+/** The order of the propertyInfo structure must
+ be the same as the PROPID numbers in the
+ openpnp-capture.h header */
 const propertyInfo_t propertyInfo[] =
 {
  {0,0,0},
@@ -109,9 +114,22 @@ of this software and associated documentation files (the "Software"), to deal
  {PU_BRIGHTNESS_CONTROL , 1, 2},
  {PU_CONTRAST_CONTROL , 1, 2},
  {PU_SATURATION_CONTROL , 1, 2},
- {PU_GAMMA_CONTROL , 1, 2}
+ {PU_GAMMA_CONTROL , 1, 2},
+ {PU_HUE_CONTROL , 1, 2},
+ {PU_SHARPNESS_CONTROL , 1, 2},
+ {PU_BACKLIGHT_COMPENSATION_CONTROL , 1, 2},
+
+ {PU_POWER_LINE_FREQUENCY_CONTROL , 1, 2}
 };
 
+#define CAPPROPID_SATURATION 8
+#define CAPPROPID_GAMMA 9
+#define CAPPROPID_HUE 10
+#define CAPPROPID_SHARPNESS 11
+#define CAPPROPID_BACKLIGHTCOMP 12
+#define CAPPROPID_COLORENABLE 13
+
+
 UVCCtrl::UVCCtrl(IOUSBInterfaceInterface190 **controller, uint32_t processingUnitID)
  : m_pud(processingUnitID),
  m_controller(controller)

diff --git a/win/platformstream.cpp b/win/platformstream.cpp
@@ -66,9 +66,11 @@ static const property_t gs_properties[] =
  {VideoProcAmp_Saturation, false},
  {VideoProcAmp_Gamma, false},
  {VideoProcAmp_Hue, false},
- {VideoProcAmp_Sharpness, false}
+ {VideoProcAmp_Sharpness, false},
+ {VideoProcAmp_BacklightCompensation, false}
 };
 
+
 // **********************************************************************
 // StreamCallbackHandler
 // **********************************************************************