Refactored Android sample (1-java)

modules/java/android/.classpath

@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="output" path="bin1"/>
+	<classpathentry kind="output" path="cls"/>
 </classpath>

samples/android/1-java/src/org/opencv/samples/s1/Sample1Java.java

@@ -8,7 +8,7 @@ import android.view.MenuItem;
 import android.view.Window;
 
 public class Sample1Java extends Activity {
-    private static final String TAG = "Sample1Java::Activity";
+    private static final String TAG             = "Sample::Activity";
 
     public static final int     VIEW_MODE_RGBA  = 0;
     public static final int     VIEW_MODE_GRAY  = 1;
@@ -24,7 +24,7 @@ public class Sample1Java extends Activity {
 
     public static int           viewMode        = VIEW_MODE_RGBA;
 
-    public Sample1Java(){
+    public Sample1Java() {
         Log.i(TAG, "Instantiated new " + this.getClass());
     }
 
@@ -37,6 +37,7 @@ public class Sample1Java extends Activity {
         setContentView(new Sample1View(this));
     }
 
+    @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         Log.i(TAG, "onCreateOptionsMenu");
         mItemPreviewRGBA = menu.add("Preview RGBA");
@@ -47,6 +48,7 @@ public class Sample1Java extends Activity {
         return true;
     }
 
+    @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         Log.i(TAG, "Menu Item selected " + item);
         if (item == mItemPreviewRGBA)

samples/android/1-java/src/org/opencv/samples/s1/Sample1View.java

@@ -21,34 +21,26 @@ class Sample1View extends SampleViewBase {
         super.surfaceChanged(_holder, format, width, height);
 
         synchronized (this) {
-            // initialize all required Mats before usage to minimize number of auxiliary jni calls
-            if(mYuv != null) mYuv.dispose();
-            mYuv = new Mat(getFrameHeight()+getFrameHeight()/2, getFrameWidth(), CvType.CV_8UC1);
-            
-            if(mRgba != null) mRgba.dispose();
-            mRgba = new Mat(getFrameHeight(), getFrameWidth(), CvType.CV_8UC4);
-            
-            if(mGraySubmat != null) mGraySubmat.dispose();
+            // initialize Mats before usage
+            mYuv = new Mat(getFrameHeight() + getFrameHeight() / 2, getFrameWidth(), CvType.CV_8UC1);
             mGraySubmat = mYuv.submat(0, getFrameHeight(), 0, getFrameWidth());
 
-            if(mIntermediateMat != null) mIntermediateMat.dispose();
-            mIntermediateMat = new Mat(getFrameHeight(), getFrameWidth(), CvType.CV_8UC1);
+            mRgba = new Mat();
+            mIntermediateMat = new Mat();
         }
     }
 
     @Override
-    protected Bitmap processFrame(byte[] data)
-    {
+    protected Bitmap processFrame(byte[] data) {
         mYuv.put(0, 0, data);
 
-        switch(Sample1Java.viewMode)
-        {
+        switch (Sample1Java.viewMode) {
         case Sample1Java.VIEW_MODE_GRAY:
             imgproc.cvtColor(mGraySubmat, mRgba, imgproc.CV_GRAY2RGBA, 4);
             break;
         case Sample1Java.VIEW_MODE_RGBA:
             imgproc.cvtColor(mYuv, mRgba, imgproc.CV_YUV420i2RGB, 4);
-            core.putText(mRgba, "OpenCV + Android", new Point(10,100), 3/*CV_FONT_HERSHEY_COMPLEX*/, 2, new Scalar(255, 0, 0, 255), 3);
+            core.putText(mRgba, "OpenCV + Android", new Point(10, 100), 3/* CV_FONT_HERSHEY_COMPLEX */, 2, new Scalar(255, 0, 0, 255), 3);
             break;
         case Sample1Java.VIEW_MODE_CANNY:
             imgproc.Canny(mGraySubmat, mIntermediateMat, 80, 100);
@@ -66,30 +58,32 @@ class Sample1View extends SampleViewBase {
         }
 
         Bitmap bmp = Bitmap.createBitmap(getFrameWidth(), getFrameHeight(), Bitmap.Config.ARGB_8888);
-        android.MatToBitmap(mRgba, bmp);
 
+        if (android.MatToBitmap(mRgba, bmp))
             return bmp;
+
+        bmp.recycle();
+        return null;
     }
 
     @Override
     public void run() {
         super.run();
 
+        synchronized (this) {
             // Explicitly deallocate Mats
-        if(mYuv != null) {
+            if (mYuv != null)
                 mYuv.dispose();
-            mYuv = null;
-        }
-        if(mRgba != null) {
+            if (mRgba != null)
                 mRgba.dispose();
-            mRgba = null;
-        }
-        if(mGraySubmat != null) {
+            if (mGraySubmat != null)
                 mGraySubmat.dispose();
-            mGraySubmat = null;
-        }
-        if(mIntermediateMat != null) {
+            if (mIntermediateMat != null)
                 mIntermediateMat.dispose();
+
+            mYuv = null;
+            mRgba = null;
+            mGraySubmat = null;
             mIntermediateMat = null;
         }
     }

samples/android/1-java/src/org/opencv/samples/s1/SampleViewBase.java

@@ -12,7 +12,7 @@ import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 
 public abstract class SampleViewBase extends SurfaceView implements SurfaceHolder.Callback, Runnable {
-	private static final String TAG = "SampleViewBase";
+    private static final String TAG = "Sample::SurfaceView";
 
     private Camera              mCamera;
     private SurfaceHolder       mHolder;
@@ -38,13 +38,13 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde
 
     public void surfaceChanged(SurfaceHolder _holder, int format, int width, int height) {
         Log.i(TAG, "surfaceCreated");
-		if ( mCamera != null) {
+        if (mCamera != null) {
             Camera.Parameters params = mCamera.getParameters();
             List<Camera.Size> sizes = params.getSupportedPreviewSizes();
             mFrameWidth = width;
             mFrameHeight = height;
 
-			//selecting optimal camera preview size
+            // selecting optimal camera preview size
             {
                 double minDiff = Double.MAX_VALUE;
                 for (Camera.Size size : sizes) {
@@ -65,24 +65,22 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde
     public void surfaceCreated(SurfaceHolder holder) {
         Log.i(TAG, "surfaceCreated");
         mCamera = Camera.open();
-	    mCamera.setPreviewCallback(
-	            new PreviewCallback() {
+        mCamera.setPreviewCallback(new PreviewCallback() {
             public void onPreviewFrame(byte[] data, Camera camera) {
-	                    synchronized(SampleViewBase.this) {
+                synchronized (SampleViewBase.this) {
                     mFrame = data;
                     SampleViewBase.this.notify();
                 }
             }
-	            }
-	    );
+        });
         (new Thread(this)).start();
     }
 
     public void surfaceDestroyed(SurfaceHolder holder) {
         Log.i(TAG, "surfaceDestroyed");
         mThreadRun = false;
-	    if(mCamera != null) {
-	        synchronized(this) {
+        if (mCamera != null) {
+            synchronized (this) {
                 mCamera.stopPreview();
                 mCamera.setPreviewCallback(null);
                 mCamera.release();
@@ -96,10 +94,10 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde
     public void run() {
         mThreadRun = true;
         Log.i(TAG, "Starting processing thread");
-	    while(mThreadRun) {
+        while (mThreadRun) {
             Bitmap bmp = null;
 
-	        synchronized(this) {
+            synchronized (this) {
                 try {
                     this.wait();
                     bmp = processFrame(mFrame);
@@ -110,8 +108,8 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde
 
             if (bmp != null) {
                 Canvas canvas = mHolder.lockCanvas();
-	        	if (canvas != null){
-	        		canvas.drawBitmap(bmp, (canvas.getWidth()-getFrameWidth())/2, (canvas.getHeight()-getFrameHeight())/2, null);
+                if (canvas != null) {
+                    canvas.drawBitmap(bmp, (canvas.getWidth() - getFrameWidth()) / 2, (canvas.getHeight() - getFrameHeight()) / 2, null);
                     mHolder.unlockCanvasAndPost(canvas);
                 }
                 bmp.recycle();