X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fkaka%2Fcakelight%2FConfiguration.java;h=d91bfb6b1200b199b03dcd3abc88720e560747e8;hb=ed56b145bc04170b4129f4ff92b9eab0e6e4dc74;hp=30308e2c1615dc6c17fd531a0b6af1dccdb864a3;hpb=100b82fe1c5ada6ef2ce768bf7b9f6f469650e11;p=kaka%2Fcakelight.git

diff --git a/src/kaka/cakelight/Configuration.java b/src/kaka/cakelight/Configuration.java
index 30308e2..d91bfb6 100644
--- a/src/kaka/cakelight/Configuration.java
+++ b/src/kaka/cakelight/Configuration.java
@@ -1,5 +1,7 @@
 package kaka.cakelight;
 
+import org.opencv.imgproc.Imgproc;
+
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -56,17 +58,26 @@ public class Configuration {
     }
 
     public class VideoConfiguration {
-        public String device;
         public int width;
         public int height;
         public int bpp;
+        public int format;
         public CropConfiguration crop;
 
         private VideoConfiguration(Properties prop) {
-            device = get(prop, "video.device", "/dev/video0");
             width = Integer.parseInt(get(prop, "video.width", "720"));
             height = Integer.parseInt(get(prop, "video.height", "576"));
             bpp = Integer.parseInt(get(prop, "video.bpp", "2"));
+            switch (get(prop, "video.format", "").toUpperCase()) {
+                case "YUYV":
+                    format = Imgproc.COLOR_YUV2RGB_YUYV;
+                    break;
+                case "YVYU":
+                    format = Imgproc.COLOR_YUV2RGB_YVYU;
+                    break;
+                default:
+                    format = Imgproc.COLOR_YUV2RGB_UYVY;
+            }
             crop = new CropConfiguration(prop);
         }
 
@@ -90,5 +101,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;
+        }
     }
 }