From 1cbe95858d6f4cd60b47e36f834a5d6ad4096319 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 20 Nov 2013 23:49:06 +0100
Subject: [PATCH] (Android) Add some missing functionality to camera texture
 handling

---
 .../com/retroarch/browser/RetroActivity.java  | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/android/phoenix/src/com/retroarch/browser/RetroActivity.java b/android/phoenix/src/com/retroarch/browser/RetroActivity.java
index 68ad940de1..235ed71b73 100644
--- a/android/phoenix/src/com/retroarch/browser/RetroActivity.java
+++ b/android/phoenix/src/com/retroarch/browser/RetroActivity.java
@@ -16,6 +16,7 @@ public final class RetroActivity extends NativeActivity
 	private Camera mCamera;
 	private long lastTimestamp = 0;
 	private SurfaceTexture texture;
+	private Boolean updateSurface = true;
 
 	public void onCameraStart()
 	{
@@ -44,6 +45,10 @@ public final class RetroActivity extends NativeActivity
 		}
 		else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH)
 		{
+			if (updateSurface)
+			{
+				texture.updateTexImage();
+			}
 			long newTimestamp = texture.getTimestamp();
 			if (newTimestamp != lastTimestamp)
 			{
@@ -67,6 +72,22 @@ public final class RetroActivity extends NativeActivity
 	{
 		mCamera.release();
 	}
+	
+	@SuppressLint("NewApi")
+	public void onCameraTextureInit(int gl_texid)
+	{
+		texture = new SurfaceTexture(gl_texid);
+		texture.setOnFrameAvailableListener(onCameraFrameAvailableListener);
+	}
+	
+    @SuppressLint("NewApi")
+	private SurfaceTexture.OnFrameAvailableListener onCameraFrameAvailableListener =
+            new SurfaceTexture.OnFrameAvailableListener() {
+        @Override
+        public void onFrameAvailable(SurfaceTexture surfaceTexture) {
+			updateSurface = true;
+        }
+    };
 
 	@SuppressLint("NewApi")
 	public void onCameraSetTexture(int gl_texid) throws IOException
@@ -74,7 +95,11 @@ public final class RetroActivity extends NativeActivity
 		Log.i("RetroActivity", "onCameraSetTexture: " + gl_texid);
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
 		{
-			texture = new SurfaceTexture(gl_texid); 
+			Camera.Parameters params = mCamera.getParameters();
+			params.setSceneMode(Camera.Parameters.SCENE_MODE_PORTRAIT);
+			mCamera.setParameters(params);
+			if (texture == null)
+				onCameraTextureInit(gl_texid);
 			mCamera.setPreviewTexture(texture);
 		}
 		else