Updates to server stuff

Author: mailmindlin

src/au/edu/jcu/v4l4j/ImageFormatList.java

@@ -476,4 +476,16 @@ public ImageFormat getYVUEncodableFormat(String n) {
 	public ImageFormat getYVUEncodableFormat(int i) {
 		return getFormat(YVU420formats, i);
 	}
+	
+	/**
+	 * Looks for a native image format with the given palette
+	 * @param palette palette to search for a format with
+	 * @return found image format, or null
+	 */
+	public ImageFormat getNativeFormatOfType(ImagePalette palette) {
+		for (ImageFormat imf : getNativeFormats())
+			if (imf.getPalette() == palette)
+				return imf;
+		return null;
+	}
 }

src/au/edu/jcu/v4l4j/VideoDevice.java

@@ -25,9 +25,12 @@
 package au.edu.jcu.v4l4j;
 
 import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.Vector;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
-import java.util.Vector;
 
 import au.edu.jcu.v4l4j.exceptions.CaptureChannelException;
 import au.edu.jcu.v4l4j.exceptions.ImageDimensionsException;
@@ -151,6 +154,16 @@
  */
 public class VideoDevice {
 
+	/**
+	 * Simple method to look for candidate video devices. Searches in the <code>/dev</code> folder
+	 * for files matching <code>video*</code>.
+	 * @return results
+	 */
+	public static Set<String> available() {
+		File dev = new File("/dev");
+		return new HashSet<>(Arrays.asList(dev.list((file, name)->(file == dev && name.startsWith("video")))));
+	}
+	
 	static {
 		try {
 			System.loadLibrary("v4l4j");
@@ -161,7 +174,7 @@ public class VideoDevice {
 	}
 
 	/**
-	 * This JNI method initialises the libv4's struct video_device
+	 * This JNI method initializes the libv4's struct video_device
 	 * 
 	 * @param device
 	 *            the name of the device file
@@ -182,7 +195,7 @@ public class VideoDevice {
 	private native void doRelease(long o);
 
 	/**
-	 * This JNI method initialises the control interface and returns an array of
+	 * This JNI method initializes the control interface and returns an array of
 	 * <code>Control</code>s.
 	 * 
 	 * @param o
@@ -249,7 +262,7 @@ public class VideoDevice {
 	private String deviceFile;
 
 	/**
-	 * The state of our VideoDevice (used for synchronisation)
+	 * The state of our VideoDevice (used for synchronization)
 	 */
 	private State state;
 
@@ -310,12 +323,12 @@ public VideoDevice(String dev) throws V4L4JException {
 	}
 
 	/**
-	 * This method initialises this VideoDevice with the information obtained
+	 * This method initializes this VideoDevice with the information obtained
 	 * from the {@link DeviceInfo}. This method must be called before any other
 	 * methods.
 	 * 
 	 * @throws V4L4JException
-	 *             if the device can not be initialised
+	 *             if the device can not be initialized
 	 */
 	private void initDeviceInfo() throws V4L4JException {
 		// initialize deviceInfo
@@ -1385,10 +1398,10 @@ public YVUFrameGrabber getYVUFrameGrabber(int w, int h, int input, int std) thro
 	 * The returned {@link RawFrameGrabber} must be released when no longer used
 	 * by calling {@link #releaseFrameGrabber()}.
 	 * 
-	 * @param w
+	 * @param width
 	 *            the desired frame width. This value may be adjusted to the
 	 *            closest supported by hardware.
-	 * @param h
+	 * @param height
 	 *            the desired frame height. This value may be adjusted to the
 	 *            closest supported by hardware.
 	 * @param input
@@ -1420,15 +1433,15 @@ public YVUFrameGrabber getYVUFrameGrabber(int w, int h, int input, int std) thro
 	 *             if a {@link FrameGrabber} already exists or if the
 	 *             <code>VideoDevice</code> has been released.
 	 */
-	public RawFrameGrabber getRawFrameGrabber(int w, int h, int input, int std, ImageFormat format)
+	public RawFrameGrabber getRawFrameGrabber(int width, int height, int input, int std, ImageFormat format)
 			throws V4L4JException {
 		if (format == null)
 			throw new ImageFormatException("The image format can not be null");
 
 		synchronized (this) {
 			if (fg == null) {
 				state.get();
-				fg = new RawFrameGrabber(deviceInfo, v4l4jObject, w, h, input, std, findTuner(input), format,
+				fg = new RawFrameGrabber(deviceInfo, v4l4jObject, width, height, input, std, findTuner(input), format,
 						threadFactory);
 				try {
 					fg.init();
@@ -1451,7 +1464,7 @@ public RawFrameGrabber getRawFrameGrabber(int w, int h, int input, int std, Imag
 					return (RawFrameGrabber) fg;
 				else {
 					state.put();
-					throw new StateException("Another FrameGrabber object already " + "exists");
+					throw new StateException("Another FrameGrabber object already exists");
 				}
 			}
 		}
@@ -1465,10 +1478,10 @@ public RawFrameGrabber getRawFrameGrabber(int w, int h, int input, int std, Imag
 	 * The {@link RawFrameGrabber} must be released when no longer used by
 	 * calling {@link #releaseFrameGrabber()}.
 	 * 
-	 * @param w
+	 * @param width
 	 *            the desired frame width. This value may be adjusted to the
 	 *            closest supported by hardware.
-	 * @param h
+	 * @param height
 	 *            the desired frame height. This value may be adjusted to the
 	 *            closest supported by hardware.
 	 * @param input
@@ -1494,11 +1507,11 @@ public RawFrameGrabber getRawFrameGrabber(int w, int h, int input, int std, Imag
 	 *             if a <code>FrameGrabber</code> already exists or if the
 	 *             <code>VideoDevice</code> has been released.
 	 */
-	public RawFrameGrabber getRawFrameGrabber(int w, int h, int input, int std) throws V4L4JException {
+	public RawFrameGrabber getRawFrameGrabber(int width, int height, int input, int std) throws V4L4JException {
 		if (deviceInfo == null)
 			throw new ImageFormatException(
 					"No DeviceInfo could be obtained. The device is probably used by another application");
-		return getRawFrameGrabber(w, h, input, std, deviceInfo.getFormatList().getNativeFormats().get(0));
+		return getRawFrameGrabber(width, height, input, std, deviceInfo.getFormatList().getNativeFormats().get(0));
 	}
 
 	/**

src/au/edu/jcu/v4l4j/encoder/h264/H264Test.java

@@ -5,6 +5,7 @@
 import org.junit.Test;
 
 import au.edu.jcu.v4l4j.ImageFormat;
+import au.edu.jcu.v4l4j.ImagePalette;
 import au.edu.jcu.v4l4j.VideoDevice;
 import au.edu.jcu.v4l4j.exceptions.V4L4JException;
 
@@ -46,10 +47,8 @@ public void testEncoder() throws Exception {
 		H264Picture picIn = new H264Picture(width, height, csp);
 
 		VideoDevice device = new VideoDevice("/dev/video0");
-		ImageFormat yuyvFormat;
-		for (ImageFormat format : device.getDeviceInfo().getFormatList().getNativeFormats()) {
-			System.out.println(format.getPalette());
-		}
+		ImageFormat yuyvFormat = device.getDeviceInfo().getFormatList().getNativeFormatOfType(ImagePalette.YUYV);
+		System.out.println(yuyvFormat);
 
 		encoder.close();
 		picIn.close();

src/au/edu/jcu/v4l4j/examples/server/CamHttpServer.java

@@ -106,25 +106,25 @@ public static void main(String[] args) throws V4L4JException, IOException {
 	 * @param fps
 	 *            the frame rate used for capture
 	 * @throws V4L4JException
-	 *             if a JPEG frame grabber cant be created
+	 *             if a JPEG frame grabber can't be created
 	 * @throws IOException
-	 *             if a server socket on the given port cant be created
+	 *             if a server socket on the given port can't be created
 	 */
 	public CamHttpServer(String dev, int width, int height, int port, int fps) throws V4L4JException, IOException {
 		this.videoDevice = new VideoDevice(dev);
 		this.frameGrabber = videoDevice.getJPEGFrameGrabber(width, height, 0, 0, 80);
 		this.frameGrabber.setCaptureCallback(this);
 		try {
-			System.out.println("setting frame rate to " + fps);
+			System.out.println("Setting frame rate to " + fps);
 			frameGrabber.setFrameInterval(1, fps);
 		} catch (Exception e) {
-			System.out.println("Couldnt set the frame interval");
+			System.out.println("Couldn't set the frame interval");
 		}
 
 		controlList = videoDevice.getControlList();
 		clients = new Vector<ClientConnection>();
 
-		// initialise tcp port to listen on
+		// initialize tcp port to listen on
 		serverSocket = new ServerSocket(port);
 
 		System.out.println("Server listening at " + serverSocket.getInetAddress().getHostAddress() + ":"
@@ -288,6 +288,7 @@ private void serverMainLoop() throws IOException, V4L4JException {
 	private int parseLine(BufferedReader in) throws IOException {
 		// read the first line to determine which page to send
 		httpLineFromClient = in.readLine();
+		System.out.println(httpLineFromClient);
 
 		if (httpLineFromClient == null)
 			throw new IOException("Read null line");
@@ -301,7 +302,7 @@ private int parseLine(BufferedReader in) throws IOException {
 			return CONTROL_PAGE;
 
 		// if the line contains the word stream, we want the control list page
-		if (httpLineFromClient.indexOf("stream") != -1)
+		if (httpLineFromClient.indexOf("stream") != -1 || httpLineFromClient.endsWith("jpg"))
 			return VIDEO_STREAM;
 
 		// if the line contains the word update, we want to update a control's

src/au/edu/jcu/v4l4j/examples/server/ClientConnection.java

@@ -40,13 +40,28 @@ public class ClientConnection {
 	private static String mainPageHTML = "HTTP/1.0 200 OK\r\n" + "Location: http://v4l4j_mini_server\r\n"
 			+ "Expires: 0\r\n" + "Content-Type: text/html\r\n" + "\r\n"
 			+ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\" http://www.w3.org/TR/html4/frameset.dtd>"
-			+ "<html>\n" + "<head>\n" + "<title>v4l4j mini server</title>\n" + "</head>\n" + "<frameset cols='4*,6*'>\n"
-			+ "<frame src='control' name='control list'>\n" + "<frame src='webcam' name='video stream'>\n"
-			+ "</frameset>\n" + "</html>";
+			+ "<html>\n"
+				+ "<head>\n"
+					+ "<title>v4l4j mini server</title>\n"
+				+ "</head>\n"
+				+ "<frameset cols='4*,6*'>\n"
+				+ "<frame src='control' name='control list'>\n"
+				+ "<frame src='webcam' name='video stream'>\n"
+				+ "</frameset>\n"
+			+ "</html>";
 
 	private static String webcamPageHTML = "HTTP/1.0 200 OK\r\n" + "Location: http://v4l4j_mini_server\r\n"
-			+ "Expires: 0\r\n" + "Content-Type: text/html\r\n" + "\r\n" + "<html>\n" + "<body>\n" + "<table>\n"
-			+ "<td>\n" + "<tr>\n" + "<img src='stream.jpg'>\n" + "</tr>\n" + "</td>\n" + "</table>\n" + "</body>\n"
+			+ "Expires: 0\r\n" + "Content-Type: text/html\r\n" + "\r\n"
+			+ "<html>\n"
+				+ "<body>\n"
+					+ "<table>\n"
+						+ "<td>\n"
+							+ "<tr>\n"
+								+ "<img src='stream.jpg'>\n"
+							+ "</tr>\n"
+						+ "</td>\n"
+					+ "</table>\n"
+				+ "</body>\n"
 			+ "</html>";
 
 	private static String controlPageHTMLHeader = "HTTP/1.0 200 OK\r\n" + "Location: http://v4l4j_mini_server\r\n"

src/au/edu/jcu/v4l4j/examples/server/RtpServer.java

@@ -3,11 +3,17 @@
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.nio.ByteBuffer;
 import java.util.LinkedList;
 import java.util.Vector;
 
+import org.gstreamer.Gst;
+import org.gstreamer.Pipeline;
+
 import au.edu.jcu.v4l4j.CaptureCallback;
-import au.edu.jcu.v4l4j.JPEGFrameGrabber;
+import au.edu.jcu.v4l4j.ImageFormat;
+import au.edu.jcu.v4l4j.ImagePalette;
+import au.edu.jcu.v4l4j.RawFrameGrabber;
 import au.edu.jcu.v4l4j.VideoDevice;
 import au.edu.jcu.v4l4j.VideoFrame;
 import au.edu.jcu.v4l4j.encoder.h264.H264Encoder;
@@ -19,7 +25,7 @@ public class RtpServer implements Runnable, CaptureCallback {
 	private ServerSocket serverSocket;
 	private VideoDevice videoDevice;
 	private H264Encoder encoder;
-	private JPEGFrameGrabber frameGrabber;
+	private RawFrameGrabber frameGrabber;
 	private Thread serverThread;
 	private LinkedList<ClientStreamingConnection> clients;
 	private long frameCount;
@@ -68,13 +74,14 @@ public RtpServer(String dev, int width, int height, int port, int fps) throws V4
 			h264Params.setCsp(X264.CSP_YV12);
 			this.encoder = new H264Encoder(h264Params);
 		}
-		this.frameGrabber = videoDevice.getJPEGFrameGrabber(width, height, 0, 0, 80);
+		ImageFormat imf = videoDevice.getDeviceInfo().getFormatList().getNativeFormatOfType(ImagePalette.YUYV);
+		this.frameGrabber = videoDevice.getRawFrameGrabber(width, height, 0, 0, imf);
 		this.frameGrabber.setCaptureCallback(this);
 		try {
-			System.out.println("setting frame rate to " + fps);
+			System.out.println("Setting frame rate to " + fps);
 			frameGrabber.setFrameInterval(1, fps);
 		} catch (Exception e) {
-			System.out.println("Couldnt set the frame interval");
+			System.out.println("Couldn't set the frame interval: " + e.getMessage());
 		}
 
 		clients = new LinkedList<>();
@@ -90,6 +97,7 @@ public RtpServer(String dev, int width, int height, int port, int fps) throws V4
 	}
 
 	public void start() {
+		Gst.init("GStreamer", new String[0]);
 		// start the tcp server thread
 		serverThread.start();
 	}
@@ -158,6 +166,7 @@ private void serverMainLoop() throws IOException, V4L4JException {
 
 			System.out.println("Serving video stream");
 
+			
 			// add new client to clients list
 			synchronized (clients) {
 				clients.add(new ClientStreamingConnection(clientSocket));
@@ -217,6 +226,9 @@ public void nextFrame(VideoFrame frame) {
 				lastFrameTimestamp = 0;
 			}
 		}
+		
+		Pipeline pipe = Pipeline.launch("");
+		
 		// send the frame to each client
 		for (ClientStreamingConnection client : copyClients) {
 			try {
@@ -248,4 +260,50 @@ public void exceptionReceived(V4L4JException e) {
 		frameGrabber.stopCapture();
 	}
 
+	static class RtpFrame {
+		ByteBuffer buffer;
+		boolean padding;
+		boolean extension;
+		byte csrc;//4 bits, 0 - 16
+		boolean marker;
+		byte payload;//7 bits
+		short sequence;//16 bits
+		int timestamp;//32 bits
+		int ssrc;//32 bits
+		byte[] csrcs = new byte[32 * 15];
+		public void build() {
+			byte tmp = (byte) (0b10000000);
+			if (padding)
+				tmp|= 0b100000;
+			if (extension)
+				tmp|= 0b10000;
+			tmp|= csrc;
+			buffer.put(tmp);
+			
+			buffer.put((byte) ((marker ? (1<<7) : 0) | payload));
+			
+			buffer.putShort(sequence);
+			
+			buffer.putInt(timestamp);
+			buffer.putInt(ssrc);
+			
+			buffer.put(csrcs, 0, csrc * 4);
+		}
+		public void setPayload(byte payload) {
+			buffer.put(1, (byte) ((marker ? (1<<7) : 0) | payload));
+			this.payload = payload;
+		}
+		public void setTimestamp(int timestamp) {
+			buffer.putInt(4, timestamp);
+			this.timestamp = timestamp;
+		}
+		public void setNumCsrcs(byte num) {
+			buffer.put(0, (byte) ((1<<7) | (padding?1<<5:0) | (extension?1<<4:0) | num));
+			this.csrc = num;
+		}
+		public void setCsrc(int index, int csrc) {
+			
+		}
+		
+	}
 }