Merge pull request #800 from asmorkalov:android_cam_idx_semantic

diff --combined modules/java/generator/src/java/android+CameraBridgeViewBase.java
index 5ec9b12,42a199a..6c5c329
--- 1/modules/java/generator/src/java/android+CameraBridgeViewBase.java
--- 2/modules/java/generator/src/java/android+CameraBridgeViewBase.java
+++ b/modules/java/generator/src/java/android+CameraBridgeViewBase.java
@@@ -47,10 -47,14 +47,14 @@@ public abstract class CameraBridgeViewB
      protected int mMaxWidth;
      protected float mScale = 0;
      protected int mPreviewFormat = Highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA;
-     protected int mCameraIndex = -1;
+     protected int mCameraIndex = CAMERA_ID_ANY;
      protected boolean mEnabled;
      protected FpsMeter mFpsMeter = null;
  
+     public static final int CAMERA_ID_ANY   = -1;
+     public static final int CAMERA_ID_BACK  = 99;
+     public static final int CAMERA_ID_FRONT = 98;
+ 
      public CameraBridgeViewBase(Context context, int cameraId) {
          super(context);
          mCameraIndex = cameraId;
@@@ -74,7 -78,6 +78,7 @@@
          getHolder().addCallback(this);
          mMaxWidth = MAX_UNSPECIFIED;
          mMaxHeight = MAX_UNSPECIFIED;
 +        styledAttrs.recycle();
      }
  
      public interface CvCameraViewListener {
@@@ -156,6 -159,8 +160,6 @@@
              mPreviewFormat = format;
          }
  
 -        private CvCameraViewListenerAdapter() {}
 -
          private int mPreviewFormat = Highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA;
          private CvCameraViewListener mOldStyleListener;
      };

diff --combined modules/java/generator/src/java/android+JavaCameraView.java
index f0036ef,c7f3558..70f1f64
--- 1/modules/java/generator/src/java/android+JavaCameraView.java
--- 2/modules/java/generator/src/java/android+JavaCameraView.java
+++ b/modules/java/generator/src/java/android+JavaCameraView.java
@@@ -6,6 -6,7 +6,7 @@@ import android.content.Context
  import android.graphics.ImageFormat;
  import android.graphics.SurfaceTexture;
  import android.hardware.Camera;
+ import android.hardware.Camera.CameraInfo;
  import android.hardware.Camera.PreviewCallback;
  import android.os.Build;
  import android.util.AttributeSet;
@@@ -68,7 -69,7 +69,7 @@@ public class JavaCameraView extends Cam
          synchronized (this) {
              mCamera = null;
  
-             if (mCameraIndex == -1) {
+             if (mCameraIndex == CAMERA_ID_ANY) {
                  Log.d(TAG, "Trying to open camera with old open()");
                  try {
                      mCamera = Camera.open();
@@@ -92,11 -93,39 +93,39 @@@
                  }
              } else {
                  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
-                     Log.d(TAG, "Trying to open camera with new open(" + Integer.valueOf(mCameraIndex) + ")");
-                     try {
-                         mCamera = Camera.open(mCameraIndex);
-                     } catch (RuntimeException e) {
-                         Log.e(TAG, "Camera #" + mCameraIndex + "failed to open: " + e.getLocalizedMessage());
+                     int localCameraIndex = mCameraIndex;
+                     if (mCameraIndex == CAMERA_ID_BACK) {
+                         Log.i(TAG, "Trying to open back camera");
+                         Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
+                         for (int camIdx = 0; camIdx < Camera.getNumberOfCameras(); ++camIdx) {
+                             Camera.getCameraInfo( camIdx, cameraInfo );
+                             if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_BACK) {
+                                 localCameraIndex = camIdx;
+                                 break;
+                             }
+                         }
+                     } else if (mCameraIndex == CAMERA_ID_FRONT) {
+                         Log.i(TAG, "Trying to open front camera");
+                         Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
+                         for (int camIdx = 0; camIdx < Camera.getNumberOfCameras(); ++camIdx) {
+                             Camera.getCameraInfo( camIdx, cameraInfo );
+                             if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
+                                 localCameraIndex = camIdx;
+                                 break;
+                             }
+                         }
+                     }
+                     if (localCameraIndex == CAMERA_ID_BACK) {
+                         Log.e(TAG, "Back camera not found!");
+                     } else if (localCameraIndex == CAMERA_ID_FRONT) {
+                         Log.e(TAG, "Front camera not found!");
+                     } else {
+                         Log.d(TAG, "Trying to open camera with new open(" + Integer.valueOf(localCameraIndex) + ")");
+                         try {
+                             mCamera = Camera.open(localCameraIndex);
+                         } catch (RuntimeException e) {
+                             Log.e(TAG, "Camera #" + localCameraIndex + "failed to open: " + e.getLocalizedMessage());
+                         }
                      }
                  }
              }
@@@ -267,6 -296,9 +296,6 @@@
              mRgba.release();
          }
  
 -        private JavaCameraFrame(CvCameraViewFrame obj) {
 -        }
 -
          private Mat mYuvFrameData;
          private Mat mRgba;
          private int mWidth;