# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1432004751 -10800
# Node ID 38377f54527a29768df184bde04cc284a6b4d464
# Parent  9df99687a2ff30c51502c237a9c76cd57f2b1632
having a whack at the camera api... at least the java crap compiles, we'll try calling it later

diff -r 9df99687a2ff -r 38377f54527a src/android/MainActivity.java
--- a/src/android/MainActivity.java	Fri May 15 05:15:47 2015 +0300
+++ b/src/android/MainActivity.java	Tue May 19 06:05:51 2015 +0300
@@ -2,99 +2,68 @@
 
 import android.app.NativeActivity;
 import android.util.Log;
+import static android.opengl.GLES20.*;
+import android.hardware.Camera;
+import android.hardware.Camera.CameraInfo;
+import android.graphics.SurfaceTexture;
 /*
 import android.os.Bundle;
 import android.content.Context;
-import android.hardware.Camera;
-import android.hardware.Camera.CameraInfo;
 import android.hardware.camera2.*;
 */
 
 public class MainActivity extends NativeActivity {
 	private static String tag = "photoshoot3d";
 
-	public static int foo(String s, int n)
+	public static void foo()
 	{
-		Log.i(tag, s + ": " + n);
-		return 42;
+		glClearColor(0.2f, 1.0f, 0.3f, 1.0f);
 	}
 
-	/*
 	// old camera api (fallback)
-	private Camera cam;
+	private static Camera cam;
 
-	// camera2 api (sdk version >= 21)
-	private CameraManager cman;
-	private CameraDevice cam2;
-	private CameraCaptureSession cam_session;
+	public static int start_video(int texid)
+	{
+		int num_cams = Camera.getNumberOfCameras();
+		Log.i(tag, "Found " + num_cams + " cameras");
 
-	@Override
-	protected void onCreate(Bundle state)
-	{
-		super.onCreate(state);
+		for(int i=0; i<num_cams; i++) {
+			CameraInfo info = new CameraInfo();
+			Camera.getCameraInfo(i, info);
 
-		if(android.os.Build.VERSION.SDK_INT >= 21) {
-			Log.i(tag, "Using the new camera API");
+			String facing_str = info.facing == CameraInfo.CAMERA_FACING_FRONT ? "front" : "back";
 
-			cman = (CameraManager)getSystemService(Context.CAMERA_SERVICE);
-
-			try {
-				String [] clist = cman.getCameraIdList();
-				Log.i(tag, "Found " + clist.length + " cameras");
-
-				for(int i=0; i<clist.length; i++) {
-					Log.i(tag, "camera[" + i + "]: " + clist[i]);
-				}
-			}
-			catch(CameraAccessException e) {
-				Log.e(tag, "camera access exception");
-			}
-
-		} else {
-			// fallback to the old Camera API
-			Log.i(tag, "Using the old camera API");
-
-			int num_cams = Camera.getNumberOfCameras();
-			Log.i(tag, "Found " + num_cams + " cameras");
-
-			for(int i=0; i<num_cams; i++) {
-				CameraInfo info = new CameraInfo();
-				Camera.getCameraInfo(i, info);
-
-				String facing_str = info.facing == CameraInfo.CAMERA_FACING_FRONT ? "front" : "back";
-
-				Log.i(tag, "camera[" + i + "]: " + facing_str);
-			}
+			Log.i(tag, "camera[" + i + "]: " + facing_str);
 		}
 
-		start_video();
+		SurfaceTexture surftex = new SurfaceTexture(texid);
+		surftex.setOnFrameAvailableListener(new FrameHandler());
+
+		cam = Camera.open();
+		try {
+			cam.setPreviewTexture(surftex);
+		}
+		catch(java.io.IOException e) {
+			Log.e(tag, "failed to set preview texture");
+			cam = null;
+			return -1;
+		}
+		cam.startPreview();
+
+		return 0;
 	}
 
-	public void start_video()
+	public static void stop_video()
 	{
-		cam = Camera.open();
-
-		CamPreview preview = new CamPreview(this, cam);
-
+		cam.stopPreview();
+		cam = null;
 	}
-	*/
 }
 
-/*
-class CamPreview extends ViewGroup implements SurfaceHolder.Callback {
-	SurfaceView surf_view;
-	SurfaceHolder surf_holder;
-
-	CamPreview(Context ctx)
+class FrameHandler implements SurfaceTexture.OnFrameAvailableListener {
+	public void onFrameAvailable(SurfaceTexture stex)
 	{
-		super(ctx);
-
-		surf_view = new SurfaceView(ctx);
-		addView(surf_view);
-
-		surf_holder = surf_view.getHolder();
-		surf_holder.addCallback(this);
-		surf_holder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
+		stex.updateTexImage();
 	}
 }
-*/
diff -r 9df99687a2ff -r 38377f54527a src/android/amain.c
--- a/src/android/amain.c	Fri May 15 05:15:47 2015 +0300
+++ b/src/android/amain.c	Tue May 19 06:05:51 2015 +0300
@@ -26,24 +26,20 @@
 static JNIEnv *jni;
 static jclass activity_class;
 
-static int call_foo(const char *s, int n)
+static int call_foo()
 {
 	jmethodID foo_id;
-	jstring jstr;
-	int res;
 
 	printf("call_foo() [activity_class=%p]\n", (void*)activity_class);
 
-	if(!(foo_id = (*jni)->GetStaticMethodID(jni, activity_class, "foo", "(Ljava/lang/String;I)I"))) {
+	if(!(foo_id = (*jni)->GetStaticMethodID(jni, activity_class, "foo", "()V"))) {
 		fprintf(stderr, "static method foo not found\n");
 		return -1;
 	}
 
-	jstr = (*jni)->NewStringUTF(jni, s);
-	res = (*jni)->CallStaticIntMethod(jni, activity_class, foo_id, jstr, n);
-	(*jni)->DeleteLocalRef(jni, jstr);
+	(*jni)->CallStaticIntMethod(jni, activity_class, foo_id);
 
-	return res;
+	return 0;
 }
 
 void android_main(struct android_app *app_ptr)
@@ -63,8 +59,6 @@
 	}
 	activity_class = (*jni)->GetObjectClass(jni, app->activity->clazz);
 
-	printf("JNI call returned: %d\n", call_foo("testing C->java jni calls", 42));
-
 	for(;;) {
 		int num_events;
 		struct android_poll_source *pollsrc;
@@ -81,6 +75,7 @@
 		}
 
 		if(init_done) {
+			call_foo();
 			game_display(get_time_msec());
 			eglSwapBuffers(dpy, surf);
 		}
diff -r 9df99687a2ff -r 38377f54527a src/game.c
--- a/src/game.c	Fri May 15 05:15:47 2015 +0300
+++ b/src/game.c	Tue May 19 06:05:51 2015 +0300
@@ -23,9 +23,9 @@
 
 void game_display(unsigned long msec)
 {
-	float tsec = (float)msec / 1000.0f;
+	//float tsec = (float)msec / 1000.0f;
 
-	glClearColor(sin(tsec * 10.0), cos(tsec * 10.0), -sin(tsec * 10.0), 1.0);
+	//glClearColor(sin(tsec * 10.0), cos(tsec * 10.0), -sin(tsec * 10.0), 1.0);
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
 	glMatrixMode(GL_MODELVIEW);