first round of abstraction

Signed-off-by: Umair Khan <[email protected]>

Author: omerjerk

src/in/omerjerk/processing/video/android/Capture.java

@@ -1,15 +1,10 @@
 package in.omerjerk.processing.video.android;
 
-import in.omerjerk.processing.video.android.helpers.FullFrameRect;
-import in.omerjerk.processing.video.android.helpers.GlUtil;
-import in.omerjerk.processing.video.android.helpers.Texture2dProgram;
-
 import java.io.IOException;
 import java.nio.IntBuffer;
 import java.util.ArrayList;
 import java.util.List;
 
-import android.app.Activity;
 import android.graphics.SurfaceTexture;
 import android.hardware.Camera;
 import android.hardware.Camera.Size;
@@ -18,24 +13,11 @@
 import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
-import processing.core.PConstants;
 import processing.core.PApplet;
-import processing.opengl.PGL;
 import processing.opengl.PGraphicsOpenGL;
-import processing.opengl.Texture;
 
 @SuppressWarnings("deprecation")
-public class Capture extends VideoBase implements CameraHandlerCallback,
-		SurfaceTexture.OnFrameAvailableListener {
-
-	private static final boolean DEBUG = true;
-	
-	private Activity activity;
-
-	public static void log(String log) {
-		if (DEBUG)
-			System.out.println(log);
-	}
+public class Capture extends VideoBase implements CameraHandlerCallback {
 
 	private Camera mCamera;
 
@@ -46,33 +28,14 @@ public static void log(String log) {
 
 	private int selectedCamera = -1;
 
-	private GLSurfaceView glView;
-	private SurfaceTexture mSurfaceTexture;
-	private FullFrameRect mFullScreen;
-	private int mTextureId;
-	private final float[] mSTMatrix = new float[16];
-	
-//	private Texture customTexture;
-	private PGraphicsOpenGL pg;
-	
-	private PGraphicsOpenGL destpg;
-
 	private CameraHandler mCameraHandler;
-	
-	IntBuffer frameBuffers = IntBuffer.allocate(1);
-	IntBuffer renderBuffers = IntBuffer.allocate(1);
-	IntBuffer customTexture = IntBuffer.allocate(1);
-	
-	private IntBuffer pixelBuffer;
-	
-	private boolean isAvailable = false;
 
 	public Capture(PApplet parent) {
 		this(parent, -1, -1);
 	}
 
 	public Capture(final PApplet parent, int width, int height) {
-		super();
+		super(parent);
 		this.parent = parent;
 		if (width == -1 || height == -1) {
 			//TODO: Temp hack. Needs to be handled intelligently.
@@ -81,8 +44,6 @@ public Capture(final PApplet parent, int width, int height) {
 		}
 		init(width, height, ARGB);
 
-		parent.registerMethod("pause", this);
-		parent.registerMethod("resume", this);
 		glView = (GLSurfaceView) parent.getSurfaceView();
 		pg = (PGraphicsOpenGL)parent.g;
 //		customTexture = new Texture(pg, width, height);
@@ -122,10 +83,6 @@ public void start() {
 				CameraHandler.MSG_START_PREVIEW));
 	}
 
-	public boolean available() {
-		return isAvailable;
-	}
-
 	@Override
 	public void loadPixels() {
 		super.loadPixels();
@@ -142,7 +99,8 @@ public void loadPixels() {
 		pixelBuffer.get(Capture.this.pixels);
 	}
 
-	public void pause() {
+	@Override
+	public void onPause() {
 		log("pause called");
 		isAvailable = false;
 		if (mCamera != null) {
@@ -164,7 +122,8 @@ public void run() {
 		});
 	}
 
-	public void resume() {
+	@Override
+	public void onResume() {
 		log("resume called");
 		glView.queueEvent(new Runnable() {
 			@Override
@@ -320,124 +279,4 @@ public void startPreview() {
 			e.printStackTrace();
 		}
 	}
-
-	@Override
-	public void onFrameAvailable(final SurfaceTexture surfaceTexture) {
-		glView.queueEvent(new Runnable() {
-			@Override
-			public void run() {
-				log("onFrameAvailable");
-				isAvailable = true;
-				surfaceTexture.updateTexImage();
-				
-				GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, frameBuffers.get(0));
-				GLES20.glViewport(0, 0, width, height);
-				surfaceTexture.getTransformMatrix(mSTMatrix);
-				mFullScreen.drawFrame(mTextureId, mSTMatrix);
-				
-				getImage(false);
-
-				/*
-				pixelBuffer.position(0);
-				GLES20.glReadPixels(0, 0, width, height, GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, pixelBuffer);
-				pixelBuffer.position(0);
-				pixelBuffer.get(Capture.this.pixels);
-				updatePixels(); */
-				
-				//Fall back to default frame buffer. Not sure if needed.
-				GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, 0);
-			}
-		});
-	}
-	
-	private void createSurfaceTexture() {
-		mFullScreen = new FullFrameRect(
-                new Texture2dProgram(Texture2dProgram.ProgramType.TEXTURE_EXT));
-        mTextureId = mFullScreen.createTextureObject();
-        mSurfaceTexture = new SurfaceTexture(mTextureId);
-        mSurfaceTexture.setOnFrameAvailableListener(Capture.this);
-	}
-
-	private void prepareFrameBuffers() {
-		
-		GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
-		
-		//Generate frame buffer
-		GLES20.glGenFramebuffers(1, frameBuffers);
-		GlUtil.checkGlError("glGenFramebuffers");
-		//Bind frame buffer
-		GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, frameBuffers.get(0));
-		GlUtil.checkGlError("glBindFramebuffer");
-		
-		//Generate render buffers
-		GLES20.glGenRenderbuffers(1, renderBuffers);
-		GlUtil.checkGlError("glGenRenderbuffers");
-		//Bind render buffers
-		GLES20.glBindRenderbuffer(GLES20.GL_RENDERBUFFER, renderBuffers.get(0));
-		GlUtil.checkGlError("glBindRenderbuffer");
-		//Allocate memory to render buffers
-		GLES20.glRenderbufferStorage(GLES20.GL_RENDERBUFFER, GLES20.GL_DEPTH_COMPONENT16, width, height);
-		GlUtil.checkGlError("glRenderbufferStorage");
-		
-		//Attach render buffer to frame buffer
-		GLES20.glFramebufferRenderbuffer(GLES20.GL_FRAMEBUFFER, GLES20.GL_DEPTH_ATTACHMENT,
-                GLES20.GL_RENDERBUFFER, renderBuffers.get(0));
-		GlUtil.checkGlError("glFramebufferRenderbuffer");
-		
-		GLES20.glGenTextures(1, customTexture);
-		GlUtil.checkGlError("glGenTextures");
-
-		GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, customTexture.get(0));
-		GlUtil.checkGlError("glBindTexture");
-		
-		GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MIN_FILTER, GLES20.GL_LINEAR);
-		GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MAG_FILTER, GLES20.GL_LINEAR);
-		GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_WRAP_S, GLES20.GL_CLAMP_TO_EDGE);
-		GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_WRAP_T, GLES20.GL_CLAMP_TO_EDGE);
-		GLES20.glTexImage2D(GLES20.GL_TEXTURE_2D, 0, GLES20.GL_RGBA, width, height, 0, GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, null);
-		GlUtil.checkGlError("glTexImage2D");
-
-		GLES20.glFramebufferTexture2D(GLES20.GL_FRAMEBUFFER, GLES20.GL_COLOR_ATTACHMENT0,
-                GLES20.GL_TEXTURE_2D, customTexture.get(0), 0);
-		GlUtil.checkGlError("glFramebufferTexture2D");
-		
-		/*
-		//No sure if this is required in opengl es 2. Ignoring as of now.
-		IntBuffer drawBuffers = IntBuffer.allocate(1);
-		drawBuffers.put(0, GLES20.GL_COLOR_ATTACHMENT0);
-		GLES30.glDrawBuffers(1, drawBuffers);
-		*/
-		
-		// See if GLES is happy with all this.
-        int status = GLES20.glCheckFramebufferStatus(GLES20.GL_FRAMEBUFFER);
-        if (status != GLES20.GL_FRAMEBUFFER_COMPLETE) {
-            throw new RuntimeException("Framebuffer not complete, status=" + status);
-        }
-	}
-	
-	//The following method has been copied from Syphon library for processing
-	public void getImage(boolean loadPixels) {
-        
-	    if (destpg == null || destpg.width != width || destpg.height != height) {
-	    	destpg = (PGraphicsOpenGL) parent.createGraphics(width, height, PConstants.P2D);
-	    	destpg.pgl.setGlThread(Thread.currentThread());
-	    }
-	    
-	    destpg.beginDraw();
-	    destpg.background(0, 0);
-	    PGL pgl = destpg.beginPGL();
-	    pgl.drawTexture(PGL.TEXTURE_2D, customTexture.get(0), width, height,
-	                    0, 0, width, height);
-	    destpg.endPGL();
-	    destpg.endDraw();
-
-	    // Uses the PGraphics texture as the cache object for the image
-	    Texture tex = destpg.getTexture();
-	    pg.setCache(this, tex);
-	    if (loadPixels) {
-	      super.loadPixels();
-	      tex.get(this.pixels);
-	      this.setLoaded(false);
-	    }
-	}
 }

src/in/omerjerk/processing/video/android/Movie.java

@@ -9,10 +9,18 @@ public Movie(PApplet parent) {
 	}
 
 	public Movie(PApplet parent, int width, int height) {
+	    super(parent);
 		if (width == -1 || height == -1) {
 			width = 720;
 			height = 1280;
 		}
 		init(width, height, ARGB);
 	}
+	
+	@Override
+	public void onPause() {
+	}
+	
+	@Override
+	public void onResume() {}
 }