Final commit from marbles

[matches/MCTX3420.git] / server / image.c

diff --git a/server/image.c b/server/image.c
index 263ce07..dcc122d 100644 (file)
--- a/server/image.c
+++ b/server/image.c
@@ -3,28 +3,104 @@
 #include "image.h"
 #include <string.h>
 #include <stdio.h>
+#include <pthread.h>
+
+static CvCapture * g_capture = NULL;
+static int g_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 = 1600, height = 1200;       // Set Default values
+       FCGIValue val[] = {
+               {"num", &num, FCGI_INT_T},
+               {"width", &width, FCGI_INT_T},
+               {"height", &height, FCGI_INT_T}
+       };
+       if (!FCGI_ParseRequest(context, params, val, 3))        // Populate val
+               return;
+       // Ensure the camera id is 0 or 1. Even though we plan to only have 1 camera attached at a time, this will allow 2. increase
+       else if (num < 0 || num > 1) {                          
+               FCGI_RejectJSON(context, "Invalid capture number");
+               return;
+       // Ensure valid widths
+       } else if (width <= 0 || height <= 0) {
+               FCGI_RejectJSON(context, "Invalid width/height");
+               return;
        }
-       static int p[] = {CV_IMWRITE_JPEG_QUALITY, 100, 0};
+       
+       IplImage * src = NULL;   // Source Image
+       CvMat * encoded = NULL;         // Encoded Image
 
-       IplImage * frame = cvQueryFrame(capture);
-       assert(frame != NULL);
-       CvMat * jpg = cvEncodeImage(".jpg", frame, p);
+       Camera_GetImage( num, width, height ,&src); 
+
+       Log(LOGDEBUG, "About to encode");
+       encoded = cvEncodeImage(".jpg",src,0);
+       Log(LOGDEBUG, "Encoded");
 
-       // Will this work?
        Log(LOGNOTE, "Sending image!");
        FCGI_PrintRaw("Content-type: image/jpg\r\n");
        FCGI_PrintRaw("Cache-Control: no-cache, no-store, must-revalidate\r\n\r\n");
-       //FCGI_PrintRaw("Content-Length: %d", jpg->rows*jpg->cols);
-       FCGI_WriteBinary(jpg->data.ptr,1,jpg->rows*jpg->cols);
+       //FCGI_PrintRaw("Content-Length: %d", g_encoded->rows*g_encoded->cols);
+       FCGI_WriteBinary(encoded->data.ptr,1,encoded->rows*encoded->cols);
+       
+       cvReleaseMat(&encoded);
+       cvReleaseImageHeader(&src);
+}
        
-       cvReleaseMat(&jpg);
-       cvReleaseImageHeader(&frame);
+/**
+ * Attempts to get an image from a camera
+ * @param num - Camera id
+ * @param width - Width to force
+ * @param height - Height to force
+ * @param image - Pointer to CvMat* to set with result
+ * @returns true on success, false on error 
+ */
+ bool Camera_GetImage(int num, int width, int height,  IplImage ** frame)
+ {
+       Log(LOGDEBUG, "Called with arguments num=%d width=%d height=%d frame=%p", num,width,height, frame);
+       static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; // Need to use a mutex to ensure 2 captures are not open at once
+       pthread_mutex_lock(&mutex);
+       bool result = false;
+
+       if( g_capture == NULL)
+       {
+               g_capture = cvCreateCameraCapture(num);
+               g_captureID = num;
+       }
+       else if( num != g_captureID)
+       {
+               cvReleaseCapture(&g_capture);
+               g_capture = cvCreateCameraCapture(num); 
+               g_captureID = num;
+       }
+
+       if (g_capture != NULL)
+       {
+
+               cvSetCaptureProperty(g_capture, CV_CAP_PROP_FRAME_WIDTH, width);
+               cvSetCaptureProperty(g_capture, CV_CAP_PROP_FRAME_HEIGHT, height);
+
+               *frame = cvQueryFrame(g_capture);
+               result = (*frame != NULL);
+
+       //cvShowImage("display", *image);
+       //cvWaitKey(0); 
+       //cvSaveImage("test.jpg",*image,0);
+               
+               Log(LOGDEBUG, "At end of mutex");
+       }
+
+       pthread_mutex_unlock(&mutex);   //Close the mutex
+
+       //NOTE: Never have a "return" statement before the mutex is unlocked; it causes deadlocks!
+       return result;
 }
+
+void Image_Cleanup()
+{
+       // Release the capture and IplImage pointers
+       //cvReleaseImageHeader(&g_frame);
+       cvReleaseCapture(&g_capture);
+}
+