# HG changeset patch
# User Eleni Maria Stea <eleni@mutantstargoat.com>
# Date 1383503805 -7200
# Node ID db8f1c036d0e53dcf2a68736b2d5dd6a34016a9b
# Parent  700127288dc567e815c75e3890ab2180adc6e670
quick backup - skata o kwdikas

diff -r 700127288dc5 -r db8f1c036d0e src/frame.cc
--- a/src/frame.cc	Thu Oct 24 00:09:13 2013 +0300
+++ b/src/frame.cc	Sun Nov 03 20:36:45 2013 +0200
@@ -1,6 +1,7 @@
 #include <GL/gl.h>
 #include <cxcore.h>
 #include <highgui.h> //TODO remove
+#include <cv.h> //TODO remove
 
 #include <pthread.h>
 #include <stdio.h>
@@ -18,7 +19,7 @@
 Frame::Frame()
 {
     video_buf = cv::Mat::zeros(KINECT_VIDEO_HEIGHT, KINECT_VIDEO_WIDTH, CV_8UC3);
-    depth_buf = cv::Mat::zeros(KINECT_DEPTH_HEIGHT, KINECT_DEPTH_WIDTH, CV_8UC1);
+    depth_buf = cv::Mat::zeros(KINECT_DEPTH_HEIGHT, KINECT_DEPTH_WIDTH, CV_16UC1);
 
 	tex_setup();
 }
@@ -81,16 +82,12 @@
 	}
 
 	/* freenect depth data to cv mat: */
-	unsigned char* src = (unsigned char*)depth;
-	unsigned char* dest = frame->depth_buf.data;
 
-	for(int i=0; i<KINECT_DEPTH_HEIGHT * KINECT_DEPTH_WIDTH; i++) {
-		*dest = *src;
-		dest++;
-		src++;
-	}
+	memcpy(frame->depth_buf.data, depth, KINECT_DEPTH_WIDTH * KINECT_DEPTH_HEIGHT * 2);
 
-	save_depth_ppm(depth, 640, 480);
+	save_depth_ppm(depth, KINECT_DEPTH_WIDTH, KINECT_DEPTH_HEIGHT);
+	cv::imshow("foo", frame->depth_buf);
+	cv::waitKey(100);
 	has_depth = true;
 }
 
@@ -101,16 +98,14 @@
 		fprintf(stderr, "Failed to open video file for writing.\n");
 		return false;
 	}
-	fprintf(fp, "P6\n640 480\n255\n");
-/*	unsigned char *ptr = (unsigned char*)video;
+	fprintf(fp, "P6\n%d %d\n255\n", w, h);
+	unsigned char *ptr = (unsigned char*)video;
 	for(int i=0; i<w * h * 3; i++) {
 		fputc(*ptr, fp);
 		ptr++;
 	}
 	fclose(fp);
 	return true;
-	*/
-	return false;
 }
 
 bool save_depth_ppm(void *depth, int w, int h)
@@ -120,15 +115,13 @@
 		fprintf(stderr, "Failed to open depth file for writing.\n");
 		return false;
 	}
-	fprintf(fp, "P6\n640 480\n255\n");
-	unsigned char *ptr = (unsigned char*)depth;
-	unsigned char *foo = (unsigned char*)depth;
-	for(int i=0; i<h; i++) {
-		for(int j=0; j<w; j++) {
-			*foo = *ptr;
-			fputc(foo[i * w + j], fp);
-			ptr++;
-		}
+	fprintf(fp, "P6\n%d %d\n255\n", w, h);
+	uint16_t *ptr = (uint16_t*)depth;
+	for(int i=0; i<w * h; i++) {
+		unsigned char c = *ptr++ >> 8;
+		fputc(c, fp);
+		fputc(c, fp);
+		fputc(c, fp);
 	}
 	fclose(fp);
 	return true;
diff -r 700127288dc5 -r db8f1c036d0e src/frame.h
--- a/src/frame.h	Thu Oct 24 00:09:13 2013 +0300
+++ b/src/frame.h	Sun Nov 03 20:36:45 2013 +0200
@@ -27,4 +27,5 @@
 
 bool save_video_ppm(void *video, int w, int h);
 bool save_depth_ppm(void *depth, int w, int h);
+
 #endif // FRAME_H_