# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1432516478 -10800
# Node ID 9fc7d52f578d8a27fe84fbfc77c9b8dbd87e12e2
# Parent  7f6e6eb3d20e12de3e6b81cbd43c643c33f3aaa9
FINALLY I'm getting an image out of the camera

diff -r 7f6e6eb3d20e -r 9fc7d52f578d src/android/MainActivity.java
--- a/src/android/MainActivity.java	Sat May 23 23:14:44 2015 +0300
+++ b/src/android/MainActivity.java	Mon May 25 04:14:38 2015 +0300
@@ -15,6 +15,7 @@
 
 public class MainActivity extends NativeActivity {
 	public static String tag = "photoshoot3d";
+	public static boolean frame_pending;
 
 	public static void foo()
 	{
@@ -30,6 +31,10 @@
 		int num_cams = Camera.getNumberOfCameras();
 		Log.i(tag, "Found " + num_cams + " cameras");
 
+		if(num_cams < 1) {
+			return -1;
+		}
+
 		for(int i=0; i<num_cams; i++) {
 			CameraInfo info = new CameraInfo();
 			Camera.getCameraInfo(i, info);
@@ -42,7 +47,12 @@
 		surftex = new SurfaceTexture(texid);
 		surftex.setOnFrameAvailableListener(new FrameHandler());
 
-		cam = Camera.open();
+		cam = Camera.open(0);
+
+		Camera.Parameters params = cam.getParameters();
+		params.set("orientation", "landscape");
+		cam.setParameters(params);
+
 		try {
 			cam.setPreviewTexture(surftex);
 		}
@@ -63,10 +73,11 @@
 		surftex = null;
 	}
 
-	public static void update()
+	public static synchronized void update()
 	{
-		if(cam != null && surftex != null) {
+		if(cam != null && surftex != null && frame_pending) {
 			surftex.updateTexImage();
+			frame_pending = false;
 		}
 	}
 }
@@ -75,7 +86,6 @@
 	@Override
 	public synchronized void onFrameAvailable(SurfaceTexture stex)
 	{
-		Log.i(MainActivity.tag, "new video frame");
-		stex.updateTexImage();
+		MainActivity.frame_pending = true;
 	}
 }
diff -r 7f6e6eb3d20e -r 9fc7d52f578d src/android/amain.c
--- a/src/android/amain.c	Sat May 23 23:14:44 2015 +0300
+++ b/src/android/amain.c	Mon May 25 04:14:38 2015 +0300
@@ -28,8 +28,6 @@
 static JNIEnv *jni;
 static jclass activity_class;
 
-static unsigned int camtex;
-
 
 
 void android_main(struct android_app *app_ptr)
@@ -100,7 +98,6 @@
 		if(cam_init(&cam_data) == -1) {
 			exit(1);
 		}
-		cam_start_video();
 
 		/* initialize the application */
 		if(game_init() == -1) {
@@ -113,18 +110,17 @@
 		/* cleanup */
 		init_done = 0;
 		game_shutdown();
-		cam_shutdown();
 		destroy_gl();
 		break;
 
 	case APP_CMD_GAINED_FOCUS:
 		/* app focused */
-		cam_start_video();
+		//cam_start_video();
 		break;
 
 	case APP_CMD_LOST_FOCUS:
 		/* app lost focus */
-		cam_stop_video();
+		//cam_stop_video();
 		break;
 
 	case APP_CMD_WINDOW_RESIZED:
diff -r 7f6e6eb3d20e -r 9fc7d52f578d src/android/camera.c
--- a/src/android/camera.c	Sat May 23 23:14:44 2015 +0300
+++ b/src/android/camera.c	Mon May 25 04:14:38 2015 +0300
@@ -102,7 +102,7 @@
 	return 0;
 }
 
-void cam_update(void)
+int cam_update(void)
 {
 	jmethodID method;
 
@@ -119,7 +119,7 @@
 		return -1;
 	}
 	(*jni)->CallStaticVoidMethod(jni, activity_class, method);
-	return;
+	return 0;
 }
 
 int cam_is_capturing(void)
diff -r 7f6e6eb3d20e -r 9fc7d52f578d src/camera.h
--- a/src/camera.h	Sat May 23 23:14:44 2015 +0300
+++ b/src/camera.h	Mon May 25 04:14:38 2015 +0300
@@ -19,7 +19,7 @@
 
 int cam_start_video(void);
 int cam_stop_video(void);
-void cam_update(void);
+int cam_update(void);
 int cam_is_capturing(void);
 
 int cam_take_picture(void);
diff -r 7f6e6eb3d20e -r 9fc7d52f578d src/game.c
--- a/src/game.c	Sat May 23 23:14:44 2015 +0300
+++ b/src/game.c	Mon May 25 04:14:38 2015 +0300
@@ -5,7 +5,7 @@
 #include "game.h"
 #include "camera.h"
 
-static void draw_quad(float sz);
+static void draw_quad(float hsz, float vsz);
 
 static int win_width, win_height;
 
@@ -17,17 +17,20 @@
 	//glEnable(GL_LIGHTING);
 
 	glClearColor(0.4, 0.4, 0.4, 1);
+
+	cam_start_video();
 	return 0;
 }
 
 void game_shutdown(void)
 {
+	cam_shutdown();
 }
 
 void game_display(unsigned long msec)
 {
 	unsigned int tex = cam_texture();
-	//cam_update();
+	cam_update();
 
 	//float tsec = (float)msec / 1000.0f;
 
@@ -40,21 +43,23 @@
 	if(tex) {
 		glBindTexture(GL_TEXTURE_EXTERNAL_OES, tex);
 		glEnable(GL_TEXTURE_EXTERNAL_OES);
+	}
 
-		draw_quad(0.5);
+	draw_quad(0.5 * 1.33333, 0.5);
 
+	if(tex) {
 		glDisable(GL_TEXTURE_EXTERNAL_OES);
 	}
 }
 
-static void draw_quad(float sz)
+static void draw_quad(float hsz, float vsz)
 {
 	static const float varr[] = {-1, -1, 1, -1, 1, 1, -1, 1};
-	static const float tcarr[] = {0, 0, 1, 0, 1, 1, 0, 1};
-	static const float colarr[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
+	static const float tcarr[] = {0, 1, 1, 1, 1, 0, 0, 0};
+	static const float colarr[] = {1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1};
 
 	glPushMatrix();
-	glScalef(sz, sz, sz);
+	glScalef(hsz, vsz, 1);
 
 	glEnableClientState(GL_VERTEX_ARRAY);
 	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
@@ -62,9 +67,9 @@
 
 	glVertexPointer(2, GL_FLOAT, 0, varr);
 	glTexCoordPointer(2, GL_FLOAT, 0, tcarr);
-	glColorPointer(3, GL_FLOAT, 0, colarr);
+	glColorPointer(4, GL_FLOAT, 0, colarr);
 
-	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+	glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
 
 	glDisableClientState(GL_VERTEX_ARRAY);
 	glDisableClientState(GL_TEXTURE_COORD_ARRAY);