X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fimage.c;h=1d352647d71adabdb7996de491b21525619484a4;hb=0654fb285c91da103314610cd4f27295e3da38f3;hp=dafe3751fd5c71ff1476afb74ea0955d4381e489;hpb=f858232d7c564f14e6d2fb9d616f8e12a1ec9171;p=matches%2FMCTX3420.git

diff --git a/server/image.c b/server/image.c
index dafe375..1d35264 100644
--- a/server/image.c
+++ b/server/image.c
@@ -4,14 +4,38 @@
 #include <string.h>
 #include <stdio.h>
 
+CvCapture *capture;
+int captureID = -1;
+
 void Image_Handler(FCGIContext * context, char * params)
 {
-	static CvCapture * capture = NULL;
-	if (capture == NULL) {
-		capture = cvCreateCameraCapture(0);
-		cvSetCaptureProperty(capture, CV_CAP_PROP_FRAME_WIDTH, 640);
-		cvSetCaptureProperty(capture, CV_CAP_PROP_FRAME_HEIGHT, 480);
+	int num = 0, width = 800, height = 600;
+	FCGIValue val[] = {
+		{"num", &num, FCGI_INT_T},
+		{"width", &width, FCGI_INT_T},
+		{"height", &height, FCGI_INT_T}
+	};
+	if (!FCGI_ParseRequest(context, params, val, 3))
+		return;
+	else if (num < 0 || num > 1) {
+		FCGI_RejectJSON(context, "Invalid capture number");
+		return;
+	} else if (width <= 0 || height <= 0) {
+		FCGI_RejectJSON(context, "Invalid width/height");
+		return;
+	}
+
+	if (captureID != num) {
+		if (captureID >= 0) {
+			cvReleaseCapture(&capture);
+		}
+		capture = cvCreateCameraCapture(num);
+		captureID = num;
 	}
+
+	cvSetCaptureProperty(capture, CV_CAP_PROP_FRAME_WIDTH, width);
+	cvSetCaptureProperty(capture, CV_CAP_PROP_FRAME_HEIGHT, height);
+
 	static int p[] = {CV_IMWRITE_JPEG_QUALITY, 100, 0};
 
 	IplImage * frame = cvQueryFrame(capture);