From 8b561a315e4ac3a7aa352d45555da379683ba578 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 18 Nov 2013 02:06:27 +0100 Subject: [PATCH] (Android) Camera - add FIXMEs --- camera/android.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/camera/android.c b/camera/android.c index 55b35ed1ae..31711e5317 100644 --- a/camera/android.c +++ b/camera/android.c @@ -53,6 +53,8 @@ static void *android_camera_init(const char *device, uint64_t caps, unsigned wid GET_OBJECT_CLASS(androidcamera->env, androidcamera->class, android_app->activity->clazz); + // FIXME - do JNI shenanigans - call RetroActivity->onCameraInit + return androidcamera; } @@ -62,6 +64,8 @@ static void android_camera_free(void *data) androidcamera_t *androidcamera = (androidcamera_t*)data; (void)android_app; + // FIXME -do JNI shenanigans - call RetroActivity->onCameraFree + (*androidcamera->java_vm)->DetachCurrentThread(androidcamera->java_vm); free(androidcamera); @@ -74,6 +78,9 @@ static bool android_camera_start(void *data) (void)android_app; (void)androidcamera; + + // FIXME - do JNI shenanigans - call RetroActivity->onCameraStart + return true; } @@ -83,6 +90,8 @@ static void android_camera_stop(void *data) androidcamera_t *androidcamera = (androidcamera_t*)data; (void)android_app; (void)androidcamera; + + // FIXME - do JNI shenanigans - call RetroActivity->onCameraStop } static bool android_camera_poll(void *data, retro_camera_frame_raw_framebuffer_t frame_raw_cb, @@ -92,8 +101,22 @@ static bool android_camera_poll(void *data, retro_camera_frame_raw_framebuffer_t androidcamera_t *androidcamera = (androidcamera_t*)data; (void)android_app; (void)androidcamera; + (void)frame_raw_cb; + unsigned gl_texid = 0; + + // FIXME - do JNI shenanigans - call RetroActivity->onCameraPoll + + // if (preprocess image JNI function returns true) + { + // FIXME - call RetroActivity->onCameraSetTexture + + //if (frame_gl_cb) + //frame_gl_cb(gl_texid, ?, ?); + return true; + } + + return false; - return true; } const camera_driver_t camera_android = {