Added gamma correction

[kaka/cakelight.git] / src / kaka / cakelight / Configuration.java

diff --git a/src/kaka/cakelight/Configuration.java b/src/kaka/cakelight/Configuration.java
index 94c5ddd..86ade8e 100644 (file)
--- a/src/kaka/cakelight/Configuration.java
+++ b/src/kaka/cakelight/Configuration.java
@@ -12,10 +12,12 @@ public class Configuration {
     private List<Map.Entry<String, String>> settings = new ArrayList<>();
     public VideoConfiguration video;
     public LedConfiguration leds;
+    public double gamma;
 
     private Configuration(Properties prop) {
         video = new VideoConfiguration(prop);
         leds = new LedConfiguration(prop);
+        gamma = Double.parseDouble(get(prop,"gamma", "1"));
     }
 
     public static Configuration from(String propertiesFile) {
@@ -70,13 +72,13 @@ public class Configuration {
             bpp = Integer.parseInt(get(prop, "video.bpp", "2"));
             switch (get(prop, "video.format", "").toUpperCase()) {
                 case "YUYV":
-                    format = Imgproc.COLOR_YUV2RGB_YUYV;
+                    format = Imgproc.COLOR_YUV2BGR_YUYV;
                     break;
                 case "YVYU":
-                    format = Imgproc.COLOR_YUV2RGB_YVYU;
+                    format = Imgproc.COLOR_YUV2BGR_YVYU;
                     break;
                 default:
-                    format = Imgproc.COLOR_YUV2RGB_UYVY;
+                    format = Imgproc.COLOR_YUV2BGR_UYVY;
             }
             crop = new CropConfiguration(prop);
         }
@@ -101,5 +103,9 @@ public class Configuration {
             cols = Integer.parseInt(get(prop, "leds.cols"));
             rows = Integer.parseInt(get(prop, "leds.rows"));
         }
+
+        public int getCount() {
+            return cols * 2 + rows * 2;
+        }
     }
 }