X-Git-Url: http://dolda2000.com/gitweb/?p=kaka%2Fcakelight.git;a=blobdiff_plain;f=src%2Fkaka%2Fcakelight%2FConfiguration.java;h=94c5dddc4c5db5791c1ff45b8c3c3dc2957e1cf9;hp=0d7bf5bac87b8e793a03c6a60e4537acb15b8fe5;hb=cc03403a7904293324578bd59fbf9eea9fd44c8d;hpb=d182b8ccdbbbdadc4441170f0135ec98c76f5d17

diff --git a/src/kaka/cakelight/Configuration.java b/src/kaka/cakelight/Configuration.java
index 0d7bf5b..94c5ddd 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;
@@ -59,12 +61,23 @@ public class Configuration {
         public int width;
         public int height;
         public int bpp;
+        public int format;
         public CropConfiguration crop;
 
         private VideoConfiguration(Properties prop) {
             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);
         }