X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fkaka%2Fcakelight%2FConfiguration.java;h=755586fd986905024a5ab5a11bce50743b6ec634;hb=eba8feca754a0875f30b8284dab67c8c01f85ef6;hp=a24f41143fa4dd74148e7173e964fc01002d1869;hpb=34d8fc098785b8aaecbc7edafeb919b1abbd07cd;p=kaka%2Fcakelight.git

diff --git a/src/kaka/cakelight/Configuration.java b/src/kaka/cakelight/Configuration.java
index a24f411..755586f 100644
--- a/src/kaka/cakelight/Configuration.java
+++ b/src/kaka/cakelight/Configuration.java
@@ -53,7 +53,10 @@ public class Configuration {
         public int height;
         public int bpp;
         public int format;
+        public boolean mjpg;
         public double saturation;
+        public String device;
+        public boolean deviceIsAutomatic;
         public CropConfiguration crop;
         public ListConfiguration list;
 
@@ -61,6 +64,8 @@ public class Configuration {
             width = Integer.parseInt(get(prop, "video.width", "720"));
             height = Integer.parseInt(get(prop, "video.height", "576"));
             bpp = Integer.parseInt(get(prop, "video.bpp", "2"));
+            device = get(prop, "video.device", "auto");
+            deviceIsAutomatic = "auto".equals(device);
             switch (get(prop, "video.format", "").toUpperCase()) {
                 case "YUYV":
                     format = Imgproc.COLOR_YUV2BGR_YUYV;
@@ -68,6 +73,9 @@ public class Configuration {
                 case "YVYU":
                     format = Imgproc.COLOR_YUV2BGR_YVYU;
                     break;
+                case "MJPG":
+                    format = 0;
+                    mjpg = true;
                 default:
                     format = Imgproc.COLOR_YUV2BGR_UYVY;
             }