Bringing the CVCamera up to speed with new changes to android-jni - added…

Bringing the CVCamera up to speed with new changes to android-jni - added settings and centered the camera.

android/apps/CVCamera/AndroidManifest.xml

@@ -13,6 +13,12 @@
 			</intent-filter>
 		</activity>
 		
+		<activity android:name="com.opencv.camera.CameraConfig" android:label="@string/app_name"
+			android:screenOrientation="landscape" 
+			android:configChanges="orientation|keyboardHidden|keyboard">
+		</activity>
+		
+
 	</application>
 
 

android/apps/CVCamera/Makefile

@@ -11,7 +11,9 @@ $(info ERROR local environement not setup! try:)
 $(info gedit $(LOCAL_ENV_MK))
 $(error Please setup the $(LOCAL_ENV_MK) - the default was just created')
 endif
-
+ifndef ARM_TARGETS
+ARM_TARGETS=armeabi armeabi-v7a
+endif
 ANDROID_NDK_BASE = $(ANDROID_NDK_ROOT)
 
 $(info OPENCV_CONFIG = $(OPENCV_CONFIG))
@@ -46,7 +48,8 @@ SWIG_C_OUT = $(SWIG_C_DIR)/cvcamera_swig.cpp
 BUILD_DEFS=OPENCV_CONFIG=$(OPENCV_CONFIG) \
 	PROJECT_PATH=$(PROJECT_PATH) \
 	V=$(V) \
-	$(NDK_FLAGS)
+	$(NDK_FLAGS) \
+	ARM_TARGETS=$(ARM_TARGETS)
 
 # The real native library stripped of symbols
 LIB		= libs/armeabi-v7a/$(LIBNAME) libs/armeabi/$(LIBNAME)

android/apps/CVCamera/jni/Application.mk

 # The ARMv7 is significanly faster due to the use of the hardware FPU
-APP_ABI := armeabi armeabi-v7a
+APP_ABI := $(ARM_TARGETS)
\ No newline at end of file

android/apps/CVCamera/jni/Processor.h

@@ -14,8 +14,6 @@
 #include <opencv2/imgproc/imgproc.hpp>
 #include <opencv2/calib3d/calib3d.hpp>
 
-
-
 #include <vector>
 
 #include "image_pool.h"
@@ -24,19 +22,8 @@
 #define DETECT_STAR 1
 #define DETECT_SURF 2
 
-class Processor {
-
-	cv::StarFeatureDetector stard;
-	cv::FastFeatureDetector fastd;
-	cv::SurfFeatureDetector surfd;
-	std::vector<cv::KeyPoint> keypoints;
-
-	vector<vector<Point2f> > imagepoints;
-
-	cv::Mat K;
-	cv::Mat distortion;
-	cv::Size imgsize;
-	//image_pool pool;
+class Processor
+{
 public:
 
   Processor();
@@ -44,7 +31,7 @@ public:
 
   void detectAndDrawFeatures(int idx, image_pool* pool, int feature_type);
 
-	bool detectAndDrawChessboard(int idx,image_pool* pool);
+  bool detectAndDrawChessboard(int idx, image_pool* pool);
 
   void resetChess();
 
@@ -53,7 +40,16 @@ public:
   void calibrate(const char* filename);
 
   void drawText(int idx, image_pool* pool, const char* text);
+private:
+  cv::StarFeatureDetector stard;
+  cv::FastFeatureDetector fastd;
+  cv::SurfFeatureDetector surfd;
+  std::vector<cv::KeyPoint> keypoints;
+  std::vector<std::vector<cv::Point2f> > imagepoints;
 
+  cv::Mat K;
+  cv::Mat distortion;
+  cv::Size imgsize;
 
 };
 

android/apps/CVCamera/sample.local.env.mk

 #location of android-opencv port of OpenCV to android
 OPENCV_CONFIG=../../build/android-opencv.mk
 ANDROID_NDK_ROOT=$(HOME)/android-ndk-r4-crystax
-
+ARM_TARGETS=armeabi armeabi-v7a

android/apps/CVCamera/src/com/theveganrobot/cvcamera/CVCamera.java

@@ -10,6 +10,7 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 import android.os.Environment;
@@ -20,16 +21,16 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewGroup.LayoutParams;
 import android.view.Window;
 import android.view.WindowManager;
-import android.view.ViewGroup.LayoutParams;
-import android.widget.AnalogClock;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.Toast;
 
+import com.opencv.camera.CameraConfig;
 import com.opencv.camera.NativePreviewer;
 import com.opencv.camera.NativeProcessor;
 import com.opencv.camera.NativeProcessor.PoolCallback;
@@ -77,12 +78,11 @@ public class CVCamera extends Activity {
 					Toast.LENGTH_LONG).show();
 			break;
 		case DIALOG_TUTORIAL_CHESS:
-			Toast
-					.makeText(
+			Toast.makeText(
 					this,
 					"Calibration Mode, Point at a chessboard pattern and press the camera button, space,"
-									+ "or the DPAD to capture.",
-							Toast.LENGTH_LONG).show();
+							+ "or the DPAD to capture.", Toast.LENGTH_LONG)
+					.show();
 			break;
 
 		default:
@@ -110,8 +110,9 @@ public class CVCamera extends Activity {
 
 	private Dialog makeCalibFileAlert() {
 		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setMessage(calib_text).setTitle(
-				"camera.yml at " + calib_file_loc).setCancelable(false)
+		builder.setMessage(calib_text)
+				.setTitle("camera.yml at " + calib_file_loc)
+				.setCancelable(false)
 				.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
 					public void onClick(DialogInterface dialog, int id) {
 
@@ -187,6 +188,7 @@ public class CVCamera extends Activity {
 		menu.add("STAR");
 		menu.add("SURF");
 		menu.add("Chess");
+		menu.add("Settings");
 		return true;
 	}
 
@@ -224,7 +226,14 @@ public class CVCamera extends Activity {
 
 		}
 
+		else if (item.getTitle().equals("Settings")) {
+
+			Intent intent = new Intent(this,CameraConfig.class);
+			startActivity(intent);
+		}
+
 		mPreview.addCallbackStack(defaultcallbackstack);
+		
 		return true;
 	}
 
@@ -234,7 +243,6 @@ public class CVCamera extends Activity {
 		super.onOptionsMenuClosed(menu);
 	}
 
-	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -263,16 +271,20 @@ public class CVCamera extends Activity {
 
 		glview = new GL2CameraViewer(getApplication(), false, 0, 0);
 		glview.setZOrderMediaOverlay(true);
-		glview.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT,
-				LayoutParams.FILL_PARENT));
+
+		LinearLayout gllay = new LinearLayout(getApplication());
+
+		gllay.setGravity(Gravity.CENTER);
+		gllay.addView(glview, params);
+		frame.addView(gllay);
 
 		ImageButton capture_button = new ImageButton(getApplicationContext());
-		capture_button.setImageDrawable(getResources().getDrawable(android.R.drawable.ic_menu_camera));
-		capture_button.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT,
-				LayoutParams.WRAP_CONTENT));
+		capture_button.setImageDrawable(getResources().getDrawable(
+				android.R.drawable.ic_menu_camera));
+		capture_button.setLayoutParams(new LayoutParams(
+				LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
 		capture_button.setOnClickListener(new View.OnClickListener() {
 
-			
 			@Override
 			public void onClick(View v) {
 				captureChess = true;
@@ -287,8 +299,8 @@ public class CVCamera extends Activity {
 		buttons.addView(capture_button);
 
 		Button focus_button = new Button(getApplicationContext());
-		focus_button.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT,
-				LayoutParams.WRAP_CONTENT));
+		focus_button.setLayoutParams(new LayoutParams(
+				LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
 		focus_button.setText("Focus");
 		focus_button.setOnClickListener(new View.OnClickListener() {
 
@@ -299,17 +311,14 @@ public class CVCamera extends Activity {
 		});
 		buttons.addView(focus_button);
 
-		frame.addView(glview);
-
 		frame.addView(buttons);
 		setContentView(frame);
 		toasts(DIALOG_OPENING_TUTORIAL);
-
 	}
 
 	@Override
 	public boolean onTrackballEvent(MotionEvent event) {
-		if(event.getAction() == MotionEvent.ACTION_UP){
+		if (event.getAction() == MotionEvent.ACTION_UP) {
 			captureChess = true;
 			return true;
 		}
@@ -320,8 +329,7 @@ public class CVCamera extends Activity {
 	protected void onPause() {
 		super.onPause();
 
-		
-		//clears the callback stack
+		// clears the callback stack
 		mPreview.onPause();
 
 		glview.onPause();
@@ -332,9 +340,9 @@ public class CVCamera extends Activity {
 	protected void onResume() {
 		super.onResume();
 		glview.onResume();
-		
-		//add an initiall callback stack to the preview on resume...
-		//this one will just draw the frames to opengl
+		mPreview.setParamsFromPrefs(getApplicationContext());
+		// add an initiall callback stack to the preview on resume...
+		// this one will just draw the frames to opengl
 		LinkedList<NativeProcessor.PoolCallback> cbstack = new LinkedList<PoolCallback>();
 		cbstack.add(glview.getDrawCallback());
 		mPreview.addCallbackStack(cbstack);
@@ -363,7 +371,6 @@ public class CVCamera extends Activity {
 				NativeProcessor nativeProcessor) {
 			processor.detectAndDrawFeatures(idx, pool, cvcamera.DETECT_STAR);
 
-
 		}
 
 	}
@@ -396,8 +403,8 @@ public class CVCamera extends Activity {
 			}
 			if (processor.getNumberDetectedChessboards() == 10) {
 
-				File opencvdir = new File(Environment
-						.getExternalStorageDirectory(), "opencv");
+				File opencvdir = new File(
+						Environment.getExternalStorageDirectory(), "opencv");
 				if (!opencvdir.exists()) {
 					opencvdir.mkdir();
 				}
@@ -486,8 +493,8 @@ public class CVCamera extends Activity {
 			}
 			if (processor.getNumberDetectedChessboards() < 10) {
 
-				processor.drawText(idx, pool, "found "
-						+ processor.getNumberDetectedChessboards()
+				processor.drawText(idx, pool,
+						"found " + processor.getNumberDetectedChessboards()
 								+ "/10 chessboards");
 			}