<!-- JDK definitions -->
- <property name="jdk.bin.1.8" value="${jdk.home.1.8}/bin"/>
- <path id="jdk.classpath.1.8">
- <fileset dir="${jdk.home.1.8}">
+ <property name="jdk.bin" value="${jdk.home}/bin"/>
+ <path id="jdk.classpath">
+ <fileset dir="${jdk.home}">
<include name="jre/lib/charsets.jar"/>
<include name="jre/lib/ext/cldrdata.jar"/>
<include name="jre/lib/ext/dnsns.jar"/>
</fileset>
</path>
- <property name="project.jdk.home" value="${jdk.home.1.8}"/>
- <property name="project.jdk.bin" value="${jdk.bin.1.8}"/>
- <property name="project.jdk.classpath" value="jdk.classpath.1.8"/>
+ <property name="project.jdk.home" value="${jdk.home}"/>
+ <property name="project.jdk.bin" value="${jdk.bin}"/>
+ <property name="project.jdk.classpath" value="jdk.classpath"/>
<!-- Project Libraries -->
-jdk.home.1.8=/usr/lib/jvm/java-8-openjdk-amd64
+jdk.home=/usr/lib/jvm/java-8-openjdk-amd64
# Video info can be found with 'v4l2-ctl --get-fmt-video'
-# Supported formats: UYVY, YUYV, YVYU
+# Supported formats: UYVY, YUYV, YVYU, MJPG
+# When using MJPG, stream data via a named pipe and point video.device at the pipe:
+# mkfifo cakelight-video-stream
+# v4l2-ctl --stream-mmap --stream-to cakelight-video-stream
video.format=UYVY
video.width=720
video.height=480
video.bpp=2
+video.device=auto
video.crop.left=27
video.crop.right=29
s = delta / max;
// Hue
- if (r == max) {
- h = (g - b) / delta; // between yellow & magenta
- } else if (g == max) {
- h = 2 + (b - r) / delta; // between cyan & yellow
+ if (delta > 0) {
+ if (r == max) {
+ h = (g - b) / delta; // between yellow & magenta
+ } else if (g == max) {
+ h = 2 + (b - r) / delta; // between cyan & yellow
+ } else {
+ h = 4 + (r - g) / delta; // between magenta & cyan
+ }
} else {
- h = 4 + (r - g) / delta; // between magenta & cyan
+ h = 0;
}
h /= 6.0;
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;
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;
case "YVYU":
format = Imgproc.COLOR_YUV2BGR_YVYU;
break;
+ case "MJPG":
+ format = 0;
+ mjpg = true;
default:
format = Imgproc.COLOR_YUV2BGR_UYVY;
}
package kaka.cakelight;
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
import java.io.*;
import java.util.Optional;
private File file;
private int bytesPerFrame;
private InputStream fileStream;
+ private final ByteArrayOutputStream bufferedBytes = new ByteArrayOutputStream();
private FrameGrabber() {
}
*/
public Optional<VideoFrame> grabFrame() {
try {
- byte[] data = new byte[bytesPerFrame];
- int count = fileStream.read(data);
- if (count != bytesPerFrame) {
- log("Expected to read " + bytesPerFrame + " bytes per frame but read " + count);
+ byte[] data;
+ if (config.video.mjpg) {
+ byte[] jpgData = readStreamingJpgData();
+ if (jpgData == null) {
+ return Optional.empty();
+ }
+ saveTemporaryJpgFile(jpgData);
+ byte[] bmpData = convertJpgFileToByteArray();
+ if (bmpData == null) {
+ return Optional.empty();
+ }
+ data = bmpData;
+ } else {
+ data = new byte[bytesPerFrame];
+ int count = fileStream.read(data);
+ if (count != bytesPerFrame) {
+ log("Expected to read " + bytesPerFrame + " bytes per frame but read " + count);
+ }
}
+
return Optional.of(VideoFrame.of(data, config));
} catch (IOException e) {
e.printStackTrace();
return Optional.empty();
}
+ private byte[] readStreamingJpgData() throws IOException {
+ byte[] data;
+ byte[] batch = new byte[1024];
+ boolean lastByteIsXX = false;
+ loop:
+ while (true) {
+ int batchCount = fileStream.read(batch);
+ if (batchCount == -1) {
+ return null;
+ }
+ if (lastByteIsXX) {
+ if (batch[0] == (byte) 0xd8) {
+ data = bufferedBytes.toByteArray();
+ bufferedBytes.reset();
+ bufferedBytes.write(0xff);
+ bufferedBytes.write(batch, 0, batchCount);
+ break;
+ }
+ bufferedBytes.write(0xff);
+ }
+ for (int i = 0; i < batchCount - 1; i++) {
+ if (batch[i] == (byte) 0xff && batch[i + 1] == (byte) 0xd8) { // start of jpeg
+ if (i > 0) {
+ bufferedBytes.write(batch, 0, i);
+ }
+ data = bufferedBytes.toByteArray();
+ bufferedBytes.reset();
+ bufferedBytes.write(batch, i, batchCount - i);
+ break loop;
+ }
+ }
+ lastByteIsXX = batch[batchCount - 1] == (byte) 0xff;
+ bufferedBytes.write(batch, 0, batchCount - (lastByteIsXX ? 1 : 0));
+ }
+ return data;
+ }
+
+ private void saveTemporaryJpgFile(byte[] data) throws IOException {
+ try (FileOutputStream fos = new FileOutputStream("/tmp/cakelight-video-stream.jpg")) {
+ fos.write(data);
+ }
+ }
+
+ private byte[] convertJpgFileToByteArray() throws IOException {
+ BufferedImage image = ImageIO.read(new File("/tmp/cakelight-video-stream.jpg"));
+ if (image != null) { // will almost always be null the first time
+ try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+ ImageIO.write(image, "bmp", baos);
+ baos.flush();
+ return baos.toByteArray();
+ }
+ } else {
+ return null;
+ }
+ }
+
@Override
public void close() throws IOException {
fileStream.close();
package kaka.cakelight;
+import org.opencv.core.Core;
import org.opencv.core.CvType;
import org.opencv.core.Mat;
import org.opencv.core.Size;
public static VideoFrame of(byte[] data, Configuration config) {
VideoFrame frame = new VideoFrame(data);
frame.config = config;
- frame.convert();
+ if (config.video.mjpg) {
+ frame.convertJpg();
+ } else {
+ frame.convert();
+ }
return frame;
}
+ private void convertJpg() {
+ Mat src = new Mat(config.video.height, config.video.width, CvType.CV_8UC3); // 8-bit, unsigned, 3 channels
+ src.put(0, 0, data);
+// save(src, "/home/kaka/test-src.data");
+
+ converted = new Mat();
+ Imgproc.cvtColor(src, converted, Imgproc.COLOR_BGR2RGB);
+
+ Core.flip(converted, converted, 0); // up-side down
+// save(converted, "/home/kaka/test-converted.data");
+ int mysteriousPixelShift = 18;
+ converted = converted.submat( // crop mysterious pixel shift
+ 0,
+ converted.rows(),
+ mysteriousPixelShift,
+ converted.cols() - mysteriousPixelShift
+ );
+// save(converted, "/home/kaka/test-croppedAgain.data");
+ model4(converted, Imgproc.INTER_AREA);
+ src.release();
+ converted.release();
+ }
+
private void convert() {
/* TODO: how to do this?
1) Resize to an image with the size of the number of leds and use config to define how many pixels deep into the screen to use.
@Override
public void enter(Configuration config) {
this.config = config;
- deviceListener.startListening();
+ if (config.video.deviceIsAutomatic) {
+ deviceListener.startListening();
+ } else {
+ File videoDevice = new File(config.video.device);
+ startGrabberThread(videoDevice);
+ }
}
@Override
@Override
public void exit() {
grabberThread.interrupt();
- deviceListener.stopListening();
+ if (config.video.deviceIsAutomatic) {
+ deviceListener.stopListening();
+ }
}
private void startGrabberThread(File videoDevice) {
Dolda2000 GitWeb / kaka / cakelight.git / commitdiff