diff --git a/samples/android/15-puzzle-framework/.classpath b/samples/android/15-puzzle-framework/.classpath
deleted file mode 100644
index a4763d1eec..0000000000
--- a/samples/android/15-puzzle-framework/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/samples/android/15-puzzle-framework/.project b/samples/android/15-puzzle-framework/.project
deleted file mode 100644
index d9387703f4..0000000000
--- a/samples/android/15-puzzle-framework/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
- 15-puzzle
-
-
-
-
-
- com.android.ide.eclipse.adt.ResourceManagerBuilder
-
-
-
-
- com.android.ide.eclipse.adt.PreCompilerBuilder
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- com.android.ide.eclipse.adt.ApkBuilder
-
-
-
-
-
- com.android.ide.eclipse.adt.AndroidNature
- org.eclipse.jdt.core.javanature
-
-
diff --git a/samples/android/15-puzzle-framework/AndroidManifest.xml b/samples/android/15-puzzle-framework/AndroidManifest.xml
deleted file mode 100644
index 0f85ed5ad4..0000000000
--- a/samples/android/15-puzzle-framework/AndroidManifest.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/android/15-puzzle-framework/ic_launcher-web.png b/samples/android/15-puzzle-framework/ic_launcher-web.png
deleted file mode 100644
index c37372acb9..0000000000
Binary files a/samples/android/15-puzzle-framework/ic_launcher-web.png and /dev/null differ
diff --git a/samples/android/15-puzzle-framework/libs/android-support-v4.jar b/samples/android/15-puzzle-framework/libs/android-support-v4.jar
deleted file mode 100644
index 018c1272b2..0000000000
Binary files a/samples/android/15-puzzle-framework/libs/android-support-v4.jar and /dev/null differ
diff --git a/samples/android/15-puzzle-framework/res/drawable-hdpi/ic_action_search.png b/samples/android/15-puzzle-framework/res/drawable-hdpi/ic_action_search.png
deleted file mode 100644
index 67de12decb..0000000000
Binary files a/samples/android/15-puzzle-framework/res/drawable-hdpi/ic_action_search.png and /dev/null differ
diff --git a/samples/android/15-puzzle-framework/res/drawable-hdpi/ic_launcher.png b/samples/android/15-puzzle-framework/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index a301d5795a..0000000000
Binary files a/samples/android/15-puzzle-framework/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/samples/android/15-puzzle-framework/res/drawable-ldpi/ic_launcher.png b/samples/android/15-puzzle-framework/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index 2c2a58b2fa..0000000000
Binary files a/samples/android/15-puzzle-framework/res/drawable-ldpi/ic_launcher.png and /dev/null differ
diff --git a/samples/android/15-puzzle-framework/res/drawable-mdpi/ic_action_search.png b/samples/android/15-puzzle-framework/res/drawable-mdpi/ic_action_search.png
deleted file mode 100644
index 134d5490bd..0000000000
Binary files a/samples/android/15-puzzle-framework/res/drawable-mdpi/ic_action_search.png and /dev/null differ
diff --git a/samples/android/15-puzzle-framework/res/drawable-mdpi/ic_launcher.png b/samples/android/15-puzzle-framework/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index f91f736fe7..0000000000
Binary files a/samples/android/15-puzzle-framework/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/samples/android/15-puzzle-framework/res/drawable-xhdpi/ic_action_search.png b/samples/android/15-puzzle-framework/res/drawable-xhdpi/ic_action_search.png
deleted file mode 100644
index d699c6b37e..0000000000
Binary files a/samples/android/15-puzzle-framework/res/drawable-xhdpi/ic_action_search.png and /dev/null differ
diff --git a/samples/android/15-puzzle-framework/res/drawable-xhdpi/ic_launcher.png b/samples/android/15-puzzle-framework/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 96095ec84b..0000000000
Binary files a/samples/android/15-puzzle-framework/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/samples/android/15-puzzle-framework/res/values/strings.xml b/samples/android/15-puzzle-framework/res/values/strings.xml
deleted file mode 100644
index 3834e21177..0000000000
--- a/samples/android/15-puzzle-framework/res/values/strings.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- 15-puzzle
- Hello world!
- Settings
- Puzzle15Activity
- Show/hide tile numbers
- Start new game
-
-
\ No newline at end of file
diff --git a/samples/android/15-puzzle-framework/res/values/styles.xml b/samples/android/15-puzzle-framework/res/values/styles.xml
deleted file mode 100644
index 4dba0d0a4c..0000000000
--- a/samples/android/15-puzzle-framework/res/values/styles.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/android/15-puzzle/.classpath b/samples/android/15-puzzle/.classpath
index a4763d1eec..3f9691c5dd 100644
--- a/samples/android/15-puzzle/.classpath
+++ b/samples/android/15-puzzle/.classpath
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/samples/android/15-puzzle/.project b/samples/android/15-puzzle/.project
index fdb9a40c42..d9387703f4 100644
--- a/samples/android/15-puzzle/.project
+++ b/samples/android/15-puzzle/.project
@@ -1,6 +1,6 @@
- OpenCV Sample - 15-puzzle
+ 15-puzzle
diff --git a/samples/android/15-puzzle/.settings/org.eclipse.jdt.core.prefs b/samples/android/15-puzzle/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 53e0495157..0000000000
--- a/samples/android/15-puzzle/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Jun 29 04:36:40 MSD 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/samples/android/15-puzzle/AndroidManifest.xml b/samples/android/15-puzzle/AndroidManifest.xml
index 5c60b62a4c..d7ac6b1955 100644
--- a/samples/android/15-puzzle/AndroidManifest.xml
+++ b/samples/android/15-puzzle/AndroidManifest.xml
@@ -1,34 +1,28 @@
-
+ package="org.opencv.samples.puzzle15"
+ android:versionCode="1"
+ android:versionName="1.0" >
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/android/15-puzzle/CMakeLists.txt b/samples/android/15-puzzle/CMakeLists.txt
deleted file mode 100644
index 4479319554..0000000000
--- a/samples/android/15-puzzle/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-set(sample example-15-puzzle)
-
-add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET})
-if(TARGET ${sample})
- add_dependencies(opencv_android_examples ${sample})
-endif()
diff --git a/samples/android/15-puzzle-framework/res/layout/activity_puzzle15.xml b/samples/android/15-puzzle/res/layout/activity_puzzle15.xml
similarity index 74%
rename from samples/android/15-puzzle-framework/res/layout/activity_puzzle15.xml
rename to samples/android/15-puzzle/res/layout/activity_puzzle15.xml
index 364acf0e28..1522afad0c 100644
--- a/samples/android/15-puzzle-framework/res/layout/activity_puzzle15.xml
+++ b/samples/android/15-puzzle/res/layout/activity_puzzle15.xml
@@ -3,10 +3,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent" >
-
+ android:id="@+id/puzzle_activity_surface_view" />
diff --git a/samples/android/15-puzzle-framework/res/menu/activity_puzzle15.xml b/samples/android/15-puzzle/res/menu/activity_puzzle15.xml
similarity index 100%
rename from samples/android/15-puzzle-framework/res/menu/activity_puzzle15.xml
rename to samples/android/15-puzzle/res/menu/activity_puzzle15.xml
diff --git a/samples/android/15-puzzle/res/values/strings.xml b/samples/android/15-puzzle/res/values/strings.xml
index 1261ead44e..1421a45051 100644
--- a/samples/android/15-puzzle/res/values/strings.xml
+++ b/samples/android/15-puzzle/res/values/strings.xml
@@ -1,4 +1,6 @@
-
OCV 15 Puzzle
-
+ Show/hide tile numbers
+ Start new game
+
+
\ No newline at end of file
diff --git a/samples/android/15-puzzle-framework/src/org/opencv/samples/puzzle15/Puzzle15Activity.java b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/Puzzle15Activity.java
similarity index 94%
rename from samples/android/15-puzzle-framework/src/org/opencv/samples/puzzle15/Puzzle15Activity.java
rename to samples/android/15-puzzle/src/org/opencv/samples/puzzle15/Puzzle15Activity.java
index 2d60a43ba3..935983c556 100644
--- a/samples/android/15-puzzle-framework/src/org/opencv/samples/puzzle15/Puzzle15Activity.java
+++ b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/Puzzle15Activity.java
@@ -5,7 +5,7 @@ import org.opencv.android.LoaderCallbackInterface;
import org.opencv.android.OpenCVLoader;
import org.opencv.core.Mat;
import org.opencv.framework.OpenCvCameraBridgeViewBase.CvCameraViewListener;
-import org.opencv.framework.OpenCvNativeCameraView;
+import org.opencv.framework.OpenCvJavaCameraView;
import android.os.Bundle;
import android.app.Activity;
@@ -20,7 +20,7 @@ public class Puzzle15Activity extends Activity implements CvCameraViewListener,
private static final String TAG = "Sample::Puzzle15::Activity";
- private OpenCvNativeCameraView mOpenCvCameraView;
+ private OpenCvJavaCameraView mOpenCvCameraView;
private Puzzle15Processor mPuzzle15;
private int mGameWidth;
@@ -54,7 +54,7 @@ public class Puzzle15Activity extends Activity implements CvCameraViewListener,
setContentView(R.layout.activity_puzzle15);
- mOpenCvCameraView = (OpenCvNativeCameraView) findViewById(R.id.puzzle_activity_surface_view);
+ mOpenCvCameraView = (OpenCvJavaCameraView) findViewById(R.id.puzzle_activity_surface_view);
mOpenCvCameraView.setCvCameraViewListener(this);
mPuzzle15 = new Puzzle15Processor();
mPuzzle15.prepareNewGame();
diff --git a/samples/android/15-puzzle-framework/src/org/opencv/samples/puzzle15/Puzzle15Processor.java b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/Puzzle15Processor.java
similarity index 100%
rename from samples/android/15-puzzle-framework/src/org/opencv/samples/puzzle15/Puzzle15Processor.java
rename to samples/android/15-puzzle/src/org/opencv/samples/puzzle15/Puzzle15Processor.java
diff --git a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/SampleCvViewBase.java b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/SampleCvViewBase.java
deleted file mode 100644
index 96020c3601..0000000000
--- a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/SampleCvViewBase.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.opencv.samples.puzzle15;
-
-import java.util.List;
-
-import org.opencv.core.Size;
-import org.opencv.highgui.VideoCapture;
-import org.opencv.highgui.Highgui;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.util.Log;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-
-public abstract class SampleCvViewBase extends SurfaceView implements SurfaceHolder.Callback, Runnable {
- private static final String TAG = "OCVSample::BaseView";
-
- private SurfaceHolder mHolder;
- private VideoCapture mCamera;
-
- public SampleCvViewBase(Context context) {
- super(context);
- mHolder = getHolder();
- mHolder.addCallback(this);
- Log.i(TAG, "Instantiated new " + this.getClass());
- }
-
- public synchronized boolean openCamera() {
- Log.i(TAG, "Opening Camera");
- mCamera = new VideoCapture(Highgui.CV_CAP_ANDROID);
- if (!mCamera.isOpened()) {
- releaseCamera();
- Log.e(TAG, "Can't open native camera");
- return false;
- }
- return true;
- }
-
- public synchronized void releaseCamera() {
- Log.i(TAG, "Releasing Camera");
- if (mCamera != null) {
- mCamera.release();
- mCamera = null;
- }
- }
-
- public synchronized void setupCamera(int width, int height) {
- if (mCamera != null && mCamera.isOpened()) {
- Log.i(TAG, "Setup Camera - " + width + "x" + height);
- List sizes = mCamera.getSupportedPreviewSizes();
- int mFrameWidth = width;
- int mFrameHeight = height;
-
- // selecting optimal camera preview size
- {
- double minDiff = Double.MAX_VALUE;
- for (Size size : sizes) {
- if (Math.abs(size.height - height) < minDiff) {
- mFrameWidth = (int) size.width;
- mFrameHeight = (int) size.height;
- minDiff = Math.abs(size.height - height);
- }
- }
- }
-
- mCamera.set(Highgui.CV_CAP_PROP_FRAME_WIDTH, mFrameWidth);
- mCamera.set(Highgui.CV_CAP_PROP_FRAME_HEIGHT, mFrameHeight);
- }
- }
-
- public void surfaceChanged(SurfaceHolder _holder, int format, int width, int height) {
- Log.i(TAG, "called surfaceChanged");
- setupCamera(width, height);
- }
-
- public void surfaceCreated(SurfaceHolder holder) {
- Log.i(TAG, "called surfaceCreated");
- (new Thread(this)).start();
- }
-
- public void surfaceDestroyed(SurfaceHolder holder) {
- Log.i(TAG, "called surfaceDestroyed");
- }
-
- protected abstract Bitmap processFrame(VideoCapture capture);
-
- public void run() {
- Log.i(TAG, "Started processing thread");
- while (true) {
- Bitmap bmp = null;
-
- synchronized (this) {
- if (mCamera == null)
- break;
-
- if (!mCamera.grab()) {
- Log.e(TAG, "mCamera.grab() failed");
- break;
- }
-
- bmp = processFrame(mCamera);
- }
-
- if (bmp != null) {
- Canvas canvas = mHolder.lockCanvas();
- if (canvas != null) {
- canvas.drawColor(0, android.graphics.PorterDuff.Mode.CLEAR);
- canvas.drawBitmap(bmp, (canvas.getWidth() - bmp.getWidth()) / 2, (canvas.getHeight() - bmp.getHeight()) / 2, null);
- mHolder.unlockCanvasAndPost(canvas);
- }
- bmp.recycle();
- }
- }
- Log.i(TAG, "Finished processing thread");
- }
-}
\ No newline at end of file
diff --git a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15Activity.java b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15Activity.java
deleted file mode 100644
index 96ef507767..0000000000
--- a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15Activity.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.opencv.samples.puzzle15;
-
-import org.opencv.android.BaseLoaderCallback;
-import org.opencv.android.LoaderCallbackInterface;
-import org.opencv.android.OpenCVLoader;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.Window;
-import android.view.WindowManager;
-
-/** Activity class implements LoaderCallbackInterface to handle OpenCV initialization status **/
-public class puzzle15Activity extends Activity {
- private static final String TAG = "OCVSample::Activity";
-
- private MenuItem mItemNewGame;
- private MenuItem mItemToggleNumbers;
- private puzzle15View mView = null;
-
- private BaseLoaderCallback mOpenCVCallBack = new BaseLoaderCallback(this) {
- @Override
- public void onManagerConnected(int status) {
- switch (status) {
- case LoaderCallbackInterface.SUCCESS:
- {
- Log.i(TAG, "OpenCV loaded successfully");
- // Create and set View
- mView = new puzzle15View(mAppContext);
- setContentView(mView);
-
- // Check native OpenCV camera
- if( !mView.openCamera() ) {
- AlertDialog ad = new AlertDialog.Builder(mAppContext).create();
- ad.setCancelable(false); // This blocks the 'BACK' button
- ad.setMessage("Fatal error: can't open camera!");
- ad.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- dialog.dismiss();
- finish();
- }
- });
- ad.show();
- }
- } break;
-
- /** OpenCV loader cannot start Google Play **/
- case LoaderCallbackInterface.MARKET_ERROR:
- {
- Log.d(TAG, "Google Play service is not accessible!");
- AlertDialog MarketErrorMessage = new AlertDialog.Builder(mAppContext).create();
- MarketErrorMessage.setTitle("OpenCV Manager");
- MarketErrorMessage.setMessage("Google Play service is not accessible!\nTry to install the 'OpenCV Manager' and the appropriate 'OpenCV binary pack' APKs from OpenCV SDK manually via 'adb install' command.");
- MarketErrorMessage.setCancelable(false); // This blocks the 'BACK' button
- MarketErrorMessage.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- finish();
- }
- });
- MarketErrorMessage.show();
- } break;
- default:
- {
- super.onManagerConnected(status);
- } break;
- }
- }
- };
-
- public puzzle15Activity() {
- Log.i(TAG, "Instantiated new " + this.getClass());
- }
-
- @Override
- protected void onPause() {
- Log.i(TAG, "called onPause");
- if (null != mView)
- mView.releaseCamera();
- super.onPause();
- }
-
- @Override
- protected void onResume() {
- Log.i(TAG, "called onResume");
- super.onResume();
-
- Log.i(TAG, "Trying to load OpenCV library");
- if (!OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_2, this, mOpenCVCallBack)) {
- Log.e(TAG, "Cannot connect to OpenCV Manager");
- }
- }
-
- /** Called when the activity is first created. */
- @Override
- public void onCreate(Bundle savedInstanceState) {
- Log.i(TAG, "called onCreate");
- super.onCreate(savedInstanceState);
- requestWindowFeature(Window.FEATURE_NO_TITLE);
- getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- Log.i(TAG, "called onCreateOptionsMenu");
- mItemNewGame = menu.add("Start new game");
- mItemToggleNumbers = menu.add("Show/hide tile numbers");
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- Log.i(TAG, "called onOptionsItemSelected; selected item: " + item);
- if (item == mItemNewGame)
- mView.startNewGame();
- else if (item == mItemToggleNumbers)
- mView.tolggleTileNumbers();
- return true;
- }
-}
\ No newline at end of file
diff --git a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15View.java b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15View.java
deleted file mode 100644
index 169fd69567..0000000000
--- a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15View.java
+++ /dev/null
@@ -1,250 +0,0 @@
-package org.opencv.samples.puzzle15;
-
-import org.opencv.android.Utils;
-import org.opencv.core.Core;
-import org.opencv.core.Mat;
-import org.opencv.core.Size;
-import org.opencv.core.Point;
-import org.opencv.core.Scalar;
-import org.opencv.highgui.Highgui;
-import org.opencv.highgui.VideoCapture;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.util.Log;
-import android.view.MotionEvent;
-import android.view.SurfaceHolder;
-import android.view.View;
-import android.view.View.OnTouchListener;
-
-public class puzzle15View extends SampleCvViewBase implements OnTouchListener {
- private static final String TAG = "OCVSample::View";
-
- private Mat mRgba;
- private Mat mRgba15;
- private Mat[] mCells;
- private Mat[] mCells15;
- private int[] mIndexses;
- private int[] mTextWidths;
- private int[] mTextHeights;
- private boolean mShowTileNumbers = true;
-
- int gridSize = 4;
- int gridArea = gridSize * gridSize;
- int gridEmptyIdx = gridArea - 1;
-
- public puzzle15View(Context context) {
- super(context);
- setOnTouchListener(this);
-
- mTextWidths = new int[gridArea];
- mTextHeights = new int[gridArea];
- for (int i = 0; i < gridArea; i++) {
- Size s = Core.getTextSize(Integer.toString(i + 1), 3/* CV_FONT_HERSHEY_COMPLEX */, 1, 2, null);
- mTextHeights[i] = (int) s.height;
- mTextWidths[i] = (int) s.width;
- }
- Log.i(TAG, "Instantiated new " + this.getClass());
- }
-
- @Override
- public void surfaceCreated(SurfaceHolder holder) {
- Log.i(TAG, "called surfaceCreated");
- synchronized (this) {
- // initialize Mat before usage
- mRgba = new Mat();
- }
-
- super.surfaceCreated(holder);
- }
-
- public static void shuffle(int[] array) {
- for (int i = array.length; i > 1; i--) {
- int temp = array[i - 1];
- int randIx = (int) (Math.random() * i);
- array[i - 1] = array[randIx];
- array[randIx] = temp;
- }
- }
-
- public boolean isPuzzleSolvable() {
- if (gridSize != 4)
- return true;
-
- int sum = 0;
- for (int i = 0; i < gridArea; i++) {
- if (mIndexses[i] == gridEmptyIdx)
- sum += (i / gridSize) + 1;
- else {
- int smaller = 0;
- for (int j = i + 1; j < gridArea; j++) {
- if (mIndexses[j] < mIndexses[i])
- smaller++;
- }
- sum += smaller;
- }
- }
-
- return sum % 2 == 0;
- }
-
- private void createPuzzle(int cols, int rows, int type) {
- mCells = new Mat[gridArea];
- mCells15 = new Mat[gridArea];
-
- mRgba15 = new Mat(rows, cols, type);
- mIndexses = new int[gridArea];
-
- for (int i = 0; i < gridSize; i++) {
- for (int j = 0; j < gridSize; j++) {
- int k = i * gridSize + j;
- mIndexses[k] = k;
- mCells[k] = mRgba.submat(i * rows / gridSize, (i + 1) * rows / gridSize, j * cols / gridSize, (j + 1) * cols / gridSize);
- mCells15[k] = mRgba15.submat(i * rows / gridSize, (i + 1) * rows / gridSize, j * cols / gridSize, (j + 1) * cols / gridSize);
- }
- }
-
- startNewGame();
- }
-
- private void drawGrid(int cols, int rows) {
- for (int i = 1; i < gridSize; i++) {
- Core.line(mRgba15, new Point(0, i * rows / gridSize), new Point(cols, i * rows / gridSize), new Scalar(0, 255, 0, 255), 3);
- Core.line(mRgba15, new Point(i * cols / gridSize, 0), new Point(i * cols / gridSize, rows), new Scalar(0, 255, 0, 255), 3);
- }
- }
-
- public synchronized void startNewGame() {
- do {
- shuffle(mIndexses);
- } while (!isPuzzleSolvable());
- }
-
- public void tolggleTileNumbers() {
- mShowTileNumbers = !mShowTileNumbers;
- }
-
- @Override
- protected Bitmap processFrame(VideoCapture capture) {
- capture.retrieve(mRgba, Highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA);
- int cols = mRgba.cols();
- int rows = mRgba.rows();
-
- rows = rows - rows%4;
- cols = cols - cols%4;
-
- if (mCells == null)
- createPuzzle(cols, rows, mRgba.type());
- else if(mRgba15.cols() != cols || mRgba15.rows() != rows) {
- releaseMats();
- createPuzzle(cols, rows, mRgba.type());
- }
-
- // copy shuffled tiles
- for (int i = 0; i < gridArea; i++) {
- int idx = mIndexses[i];
- if (idx == gridEmptyIdx)
- mCells15[i].setTo(new Scalar(0x33, 0x33, 0x33, 0xFF));
- else {
- mCells[idx].copyTo(mCells15[i]);
- if (mShowTileNumbers) {
- Core.putText(mCells15[i], Integer.toString(1 + idx), new Point((cols / gridSize - mTextWidths[idx]) / 2,
- (rows / gridSize + mTextHeights[idx]) / 2), 3/* CV_FONT_HERSHEY_COMPLEX */, 1, new Scalar(255, 0, 0, 255), 2);
- }
- }
- }
-
- drawGrid(cols, rows);
- Bitmap bmp = Bitmap.createBitmap(cols, rows, Bitmap.Config.ARGB_8888);
- try {
- Utils.matToBitmap(mRgba15, bmp);
- return bmp;
- } catch(Exception e) {
- Log.e("org.opencv.samples.puzzle15", "Utils.matToBitmap() throws an exception: " + e.getMessage());
- bmp.recycle();
- return null;
- }
- }
-
- @Override
- public void run() {
- super.run();
-
- synchronized (this) {
- releaseMats();
-
- if (mRgba != null)
- mRgba.release();
- mRgba = null;
- }
- }
-
- private void releaseMats() {
- // Explicitly deallocate Mats
- if (mCells != null) {
- for (Mat m : mCells)
- m.release();
- }
- if (mCells15 != null) {
- for (Mat m : mCells15)
- m.release();
- }
-
- if (mRgba15 != null)
- mRgba15.release();
-
- mRgba15 = null;
- mCells = null;
- mCells15 = null;
- mIndexses = null;
- }
-
- public boolean onTouch(View v, MotionEvent event) {
- if(mRgba==null) return false;
-
- int cols = mRgba.cols();
- int rows = mRgba.rows();
- float xoffset = (getWidth() - cols) / 2;
- float yoffset = (getHeight() - rows) / 2;
-
- float x = event.getX() - xoffset;
- float y = event.getY() - yoffset;
-
- int row = (int) Math.floor(y * gridSize / rows);
- int col = (int) Math.floor(x * gridSize / cols);
-
- if (row < 0 || row >= gridSize || col < 0 || col >= gridSize)
- return false;
-
- int idx = row * gridSize + col;
- int idxtoswap = -1;
-
- // left
- if (idxtoswap < 0 && col > 0)
- if (mIndexses[idx - 1] == gridEmptyIdx)
- idxtoswap = idx - 1;
- // right
- if (idxtoswap < 0 && col < gridSize - 1)
- if (mIndexses[idx + 1] == gridEmptyIdx)
- idxtoswap = idx + 1;
- // top
- if (idxtoswap < 0 && row > 0)
- if (mIndexses[idx - gridSize] == gridEmptyIdx)
- idxtoswap = idx - gridSize;
- // bottom
- if (idxtoswap < 0 && row < gridSize - 1)
- if (mIndexses[idx + gridSize] == gridEmptyIdx)
- idxtoswap = idx + gridSize;
-
- // swap
- if (idxtoswap >= 0) {
- synchronized (this) {
- int touched = mIndexses[idx];
- mIndexses[idx] = mIndexses[idxtoswap];
- mIndexses[idxtoswap] = touched;
- }
- }
-
- return false;// don't need subsequent touch events
- }
-}
diff --git a/samples/android/camera-preview/.classpath b/samples/android/camera-preview/.classpath
deleted file mode 100644
index 3f9691c5dd..0000000000
--- a/samples/android/camera-preview/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/samples/android/camera-preview/.project b/samples/android/camera-preview/.project
deleted file mode 100644
index d8e9953e80..0000000000
--- a/samples/android/camera-preview/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
- CameraWriter
-
-
-
-
-
- com.android.ide.eclipse.adt.ResourceManagerBuilder
-
-
-
-
- com.android.ide.eclipse.adt.PreCompilerBuilder
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- com.android.ide.eclipse.adt.ApkBuilder
-
-
-
-
-
- com.android.ide.eclipse.adt.AndroidNature
- org.eclipse.jdt.core.javanature
-
-
diff --git a/samples/android/camera-preview/.settings/org.eclipse.jdt.core.prefs b/samples/android/camera-preview/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 53e0495157..0000000000
--- a/samples/android/camera-preview/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Jun 29 04:36:40 MSD 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/samples/android/camera-preview/AndroidManifest.xml b/samples/android/camera-preview/AndroidManifest.xml
deleted file mode 100644
index 5adf3a385f..0000000000
--- a/samples/android/camera-preview/AndroidManifest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/android/camera-preview/CMakeLists.txt b/samples/android/camera-preview/CMakeLists.txt
deleted file mode 100644
index b04c24a37e..0000000000
--- a/samples/android/camera-preview/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-set(sample example-camera-preview)
-
-add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET})
-if(TARGET ${sample})
- add_dependencies(opencv_android_examples ${sample})
-endif()
diff --git a/samples/android/camera-preview/res/drawable/ic_action_search.png b/samples/android/camera-preview/res/drawable/ic_action_search.png
deleted file mode 100644
index 67de12decb..0000000000
Binary files a/samples/android/camera-preview/res/drawable/ic_action_search.png and /dev/null differ
diff --git a/samples/android/camera-preview/res/drawable/ic_launcher.png b/samples/android/camera-preview/res/drawable/ic_launcher.png
deleted file mode 100644
index a301d5795a..0000000000
Binary files a/samples/android/camera-preview/res/drawable/ic_launcher.png and /dev/null differ
diff --git a/samples/android/camera-preview/res/layout/activity_camera_writer.xml b/samples/android/camera-preview/res/layout/activity_camera_writer.xml
deleted file mode 100644
index d31172176a..0000000000
--- a/samples/android/camera-preview/res/layout/activity_camera_writer.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
diff --git a/samples/android/camera-preview/res/values/strings.xml b/samples/android/camera-preview/res/values/strings.xml
deleted file mode 100644
index 52c8f4b563..0000000000
--- a/samples/android/camera-preview/res/values/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- CameraWriter
- Settings
- CameraWriterActivity
-
-
\ No newline at end of file
diff --git a/samples/android/camera-preview/res/values/styles.xml b/samples/android/camera-preview/res/values/styles.xml
deleted file mode 100644
index 4dba0d0a4c..0000000000
--- a/samples/android/camera-preview/res/values/styles.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/android/camera-preview/src/org/opencv/test/camerawriter/CameraViewBase.java b/samples/android/camera-preview/src/org/opencv/test/camerawriter/CameraViewBase.java
deleted file mode 100644
index 44effbfe50..0000000000
--- a/samples/android/camera-preview/src/org/opencv/test/camerawriter/CameraViewBase.java
+++ /dev/null
@@ -1,301 +0,0 @@
-package org.opencv.test.camerawriter;
-
-import java.util.List;
-
-import org.opencv.android.Utils;
-import org.opencv.core.Mat;
-import org.opencv.core.Size;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-
-/**
- * This is a basic class, implementing the interaction with Camera and OpenCV library.
- * The main responsibility of it - is to control when camera can be enabled, process the frame,
- * call external listener to make any adjustments to the frame and then draw the resulting
- * frame to the screen.
- * The clients shall implement CvCameraViewListener
- */
-public abstract class CameraViewBase extends SurfaceView implements SurfaceHolder.Callback {
-
- private static final int MAX_UNSPECIFIED = -1;
-
- protected int mFrameWidth;
- protected int mFrameHeight;
-
- protected int mMaxHeight;
- protected int mMaxWidth;
-
- private Bitmap mCacheBitmap;
-
-
- public CameraViewBase(Context context, AttributeSet attrs) {
- super(context,attrs);
- Log.d(TAG, "call CameraViewBase constructor");
- getHolder().addCallback(this);
- mMaxWidth = MAX_UNSPECIFIED;
- mMaxHeight = MAX_UNSPECIFIED;
-
- }
-
- public interface CvCameraViewListener {
- /**
- * This method is invoked when camera preview has started. After this method is invoked
- * the frames will start to be delivered to client via the onCameraFrame() callback.
- * @param width - the width of the frames that will be delivered
- * @param height - the height of the frames that will be delivered
- */
- public void onCameraViewStarted(int width, int height);
-
- /**
- * This method is invoked when camera preview has been stopped for some reason.
- * No frames will be delivered via onCameraFrame() callback after this method is called.
- */
- public void onCameraViewStopped();
-
- /**
- * This method is invoked when delivery of the frame needs to be done.
- * The returned values - is a modified frame which needs to be displayed on the screen.
- */
- public Mat onCameraFrame(Mat inputFrame);
-
- }
-
-
- private static final int STOPPED = 0;
- private static final int STARTED = 1;
- private static final String TAG = "SampleCvBase";
-
- private CvCameraViewListener mListener;
- private int mState = STOPPED;
-
- private boolean mEnabled;
- private boolean mSurfaceExist;
-
-
-
- private Object mSyncObject = new Object();
-
- public void surfaceChanged(SurfaceHolder arg0, int arg1, int arg2, int arg3) {
- synchronized(mSyncObject) {
- if (!mSurfaceExist) {
- mSurfaceExist = true;
- checkCurrentState();
- } else {
- /** Surface changed. We need to stop camera and restart with new parameters */
- /* Pretend that old surface has been destroyed */
- mSurfaceExist = false;
- checkCurrentState();
- /* Now use new surface. Say we have it now */
- mSurfaceExist = true;
- checkCurrentState();
- }
- }
- }
-
- public void surfaceCreated(SurfaceHolder holder) {
- /* Do nothing. Wait until surfaceChanged delivered */
- }
-
- public void surfaceDestroyed(SurfaceHolder holder) {
- synchronized(mSyncObject) {
- mSurfaceExist = false;
- checkCurrentState();
- }
- }
-
-
- /**
- * This method is provided for clients, so they can enable the camera connection.
- * The actual onCameraViewStarted callback will be delivered only after both this method is called and surface is available
- */
- public void enableView() {
- synchronized(mSyncObject) {
- mEnabled = true;
- checkCurrentState();
- }
- }
-
- /**
- * This method is provided for clients, so they can disable camera connection and stop
- * the delivery of frames even though the surface view itself is not destroyed and still stays on the scren
- */
- public void disableView() {
- synchronized(mSyncObject) {
- mEnabled = false;
- checkCurrentState();
- }
- }
-
-
- public void setCvCameraViewListener(CvCameraViewListener listener) {
- mListener = listener;
- }
-
- /**
- * This method sets the maximum size that camera frame is allowed to be. When selecting
- * size - the biggest size which less or equal the size set will be selected.
- * As an example - we set setMaxFrameSize(200,200) and we have 176x152 and 320x240 sizes. The
- * preview frame will be selected with 176x152 size.
- * This method is useful when need to restrict the size of preview frame for some reason (for example for video recording)
- * @param maxWidth - the maximum width allowed for camera frame.
- * @param maxHeight - the maximum height allowed for camera frame
- */
- public void setMaxFrameSize(int maxWidth, int maxHeight) {
- mMaxWidth = maxWidth;
- mMaxHeight = maxHeight;
- }
-
- /**
- * Called when mSyncObject lock is held
- */
- private void checkCurrentState() {
- int targetState;
-
- if (mEnabled && mSurfaceExist) {
- targetState = STARTED;
- } else {
- targetState = STOPPED;
- }
-
- if (targetState != mState) {
- /* The state change detected. Need to exit the current state and enter target state */
- processExitState(mState);
- mState = targetState;
- processEnterState(mState);
- }
- }
-
- private void processEnterState(int state) {
- switch(state) {
- case STARTED:
- onEnterStartedState();
- if (mListener != null) {
- mListener.onCameraViewStarted(mFrameWidth, mFrameHeight);
- }
- break;
- case STOPPED:
- onEnterStoppedState();
- if (mListener != null) {
- mListener.onCameraViewStopped();
- }
- break;
- };
- }
-
-
- private void processExitState(int state) {
- switch(state) {
- case STARTED:
- onExitStartedState();
- break;
- case STOPPED:
- onExitStoppedState();
- break;
- };
- }
-
- private void onEnterStoppedState() {
- /* nothing to do */
- }
-
- private void onExitStoppedState() {
- /* nothing to do */
- }
-
- private void onEnterStartedState() {
-
- connectCamera(getWidth(), getHeight());
- /* Now create cache Bitmap */
- mCacheBitmap = Bitmap.createBitmap(mFrameWidth, mFrameHeight, Bitmap.Config.ARGB_8888);
-
- }
-
- private void onExitStartedState() {
-
- disconnectCamera();
- if (mCacheBitmap != null) {
- mCacheBitmap.recycle();
- }
- }
-
-
- /**
- * This method shall be called by the subclasses when they have valid
- * object and want it to be delivered to external client (via callback) and
- * then displayed on the screen.
- * @param frame - the current frame to be delivered
- */
- protected void deliverAndDrawFrame(Mat frame) {
- Mat modified;
-
- synchronized(mSyncObject) {
- if (mListener != null) {
- modified = mListener.onCameraFrame(frame);
- } else {
- modified = frame;
- }
-
- if (modified != null) {
- Utils.matToBitmap(modified, mCacheBitmap);
- }
-
- if (mCacheBitmap != null) {
- Canvas canvas = getHolder().lockCanvas();
- if (canvas != null) {
- canvas.drawColor(0, android.graphics.PorterDuff.Mode.CLEAR);
- canvas.drawBitmap(mCacheBitmap, (canvas.getWidth() - mCacheBitmap.getWidth()) / 2, (canvas.getHeight() - mCacheBitmap.getHeight()) / 2, null);
- getHolder().unlockCanvasAndPost(canvas);
- }
- }
- }
- }
-
- /**
- * This method is invoked shall perform concrete operation to initialize the camera.
- * CONTRACT: as a result of this method variables mFrameWidth and mFrameHeight MUST be
- * initialized with the size of the Camera frames that will be delivered to external processor.
- * @param width - the width of this SurfaceView
- * @param height - the height of this SurfaceView
- */
- protected abstract void connectCamera(int width, int height);
-
- /**
- * Disconnects and release the particular camera object beeing connected to this surface view.
- * Called when syncObject lock is held
- */
- protected abstract void disconnectCamera();
-
-
- /**
- * This helper method can be called by subclasses to select camera preview size.
- * It goes over the list of the supported preview sizes and selects the maximum one which
- * fits both values set via setMaxFrameSize() and surface frame allocated for this view
- * @param supportedSizes
- * @param surfaceWidth
- * @param surfaceHeight
- * @return
- */
- protected Size calculateCameraFrameSize(List supportedSizes, int surfaceWidth, int surfaceHeight) {
- int calcWidth = 0;
- int calcHeight = 0;
-
- int maxAllowedWidth = (mMaxWidth != MAX_UNSPECIFIED && mMaxWidth < surfaceWidth)? mMaxWidth : surfaceWidth;
- int maxAllowedHeight = (mMaxHeight != MAX_UNSPECIFIED && mMaxHeight < surfaceHeight)? mMaxHeight : surfaceHeight;
-
- for (Size size : supportedSizes) {
- if (size.width <= maxAllowedWidth && size.height <= maxAllowedHeight) {
- if (size.width >= calcWidth && size.height >= calcHeight) {
- calcWidth = (int) size.width;
- calcHeight = (int) size.height;
- }
- }
- }
- return new Size(calcWidth, calcHeight);
- }
-}
diff --git a/samples/android/camera-preview/src/org/opencv/test/camerawriter/NativeCameraView.java b/samples/android/camera-preview/src/org/opencv/test/camerawriter/NativeCameraView.java
deleted file mode 100644
index 6bb39a48a3..0000000000
--- a/samples/android/camera-preview/src/org/opencv/test/camerawriter/NativeCameraView.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.opencv.test.camerawriter;
-
-import org.opencv.core.Mat;
-import org.opencv.core.Size;
-import org.opencv.highgui.Highgui;
-import org.opencv.highgui.VideoCapture;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.util.Log;
-
-/**
- * This class is an implementation of a bridge between SurfaceView and native OpenCV camera.
- * Due to the big amount of work done, by the base class this child is only responsible
- * for creating camera, destroying camera and delivering frames while camera is enabled
- */
-public class NativeCameraView extends CameraViewBase {
-
- public static final String TAG = "OpenCvNativeCameraView";
- private boolean mStopThread;
- private Thread mThread;
- private VideoCapture mCamera;
-
-
- public NativeCameraView(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
-
- @Override
- protected void connectCamera(int width, int height) {
-
- /* 1. We need to instantiate camera
- * 2. We need to start thread which will be getting frames
- */
- /* First step - initialize camera connection */
- initializeCamera(getWidth(), getHeight());
-
- /* now we can start update thread */
- mThread = new Thread(new CameraWorker());
- mThread.start();
- }
-
- @Override
- protected void disconnectCamera() {
- /* 1. We need to stop thread which updating the frames
- * 2. Stop camera and release it
- */
- try {
- mStopThread = true;
- mThread.join();
- } catch (InterruptedException e) {
- e.printStackTrace();
- } finally {
- mThread = null;
- mStopThread = false;
- }
-
- /* Now release camera */
- releaseCamera();
-
- }
-
- private void initializeCamera(int width, int height) {
- mCamera = new VideoCapture(Highgui.CV_CAP_ANDROID);
- //TODO: improve error handling
-
- java.util.List sizes = mCamera.getSupportedPreviewSizes();
-
- /* Select the size that fits surface considering maximum size allowed */
- Size frameSize = calculateCameraFrameSize(sizes, width, height);
-
-
- double frameWidth = frameSize.width;
- double frameHeight = frameSize.height;
-
-
- mCamera.set(Highgui.CV_CAP_PROP_FRAME_WIDTH, frameWidth);
- mCamera.set(Highgui.CV_CAP_PROP_FRAME_HEIGHT, frameHeight);
-
- mFrameWidth = (int)frameWidth;
- mFrameHeight = (int)frameHeight;
-
- Log.i(TAG, "Selected camera frame size = (" + mFrameWidth + ", " + mFrameHeight + ")");
- }
-
- private void releaseCamera() {
- if (mCamera != null) {
- mCamera.release();
- }
- }
-
- private class CameraWorker implements Runnable {
- public void run() {
- do {
- if (!mCamera.grab()) {
- Log.e(TAG, "Camera frame grab failed");
- break;
- }
- mCamera.retrieve(mRgba, Highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA);
-
- deliverAndDrawFrame(mRgba);
-
- } while (!mStopThread);
- }
-
- private Mat mRgba = new Mat();
- }
-
-}
diff --git a/samples/android/camera-preview/src/org/opencv/test/camerawriter/PreviewActivity.java b/samples/android/camera-preview/src/org/opencv/test/camerawriter/PreviewActivity.java
deleted file mode 100644
index 50b283fdf6..0000000000
--- a/samples/android/camera-preview/src/org/opencv/test/camerawriter/PreviewActivity.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.opencv.test.camerawriter;
-
-import org.opencv.android.BaseLoaderCallback;
-import org.opencv.android.LoaderCallbackInterface;
-import org.opencv.android.OpenCVLoader;
-import org.opencv.core.Mat;
-import org.opencv.test.camerawriter.CameraViewBase.CvCameraViewListener;
-
-import android.os.Bundle;
-import android.app.Activity;
-import android.util.Log;
-
-public class PreviewActivity extends Activity implements CvCameraViewListener {
-
- protected static final String TAG = "CameraWriterActivity";
-
- private CameraViewBase mCameraView;
-
- private BaseLoaderCallback mLoaderCallback = new BaseLoaderCallback(this) {
- @Override
- public void onManagerConnected(int status) {
- switch (status) {
- case LoaderCallbackInterface.SUCCESS:
- Log.i(TAG, "OpenCV loaded successfully");
- // Create and set View
- mCameraView.setMaxFrameSize(640, 480);
- mCameraView.enableView();
- break;
- default:
- super.onManagerConnected(status);
- break;
- }
- }
- };
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_camera_writer);
-
- mCameraView = (CameraViewBase)findViewById(R.id.camera_surface_view);
- mCameraView.setCvCameraViewListener(this);
- OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_2, this, mLoaderCallback);
-
- }
-
- public void onCameraViewStarted(int width, int height) {
- // TODO Auto-generated method stub
-
- }
-
- public void onCameraViewStopped() {
- // TODO Auto-generated method stub
-
- }
-
- public Mat onCameraFrame(Mat inputFrame) {
- return inputFrame;
- }
-}
diff --git a/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/Sample0Base.java b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/Sample0Base.java
index 4706b74784..02a0a149ab 100644
--- a/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/Sample0Base.java
+++ b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/Sample0Base.java
@@ -5,16 +5,11 @@ import android.app.AlertDialog;
import android.content.DialogInterface;
import android.os.Bundle;
import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
import android.view.Window;
public class Sample0Base extends Activity {
private static final String TAG = "OCVSample::Activity";
-
- private MenuItem mItemPreviewRGBA;
- private MenuItem mItemPreviewGray;
private Sample0View mView;
public Sample0Base() {
@@ -55,22 +50,4 @@ public class Sample0Base extends Activity {
mView = new Sample0View(this);
setContentView(mView);
}
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- Log.i(TAG, "called onCreateOptionsMenu");
- mItemPreviewRGBA = menu.add("Preview RGBA");
- mItemPreviewGray = menu.add("Preview GRAY");
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- Log.i(TAG, "called onOptionsItemSelected; selected item: " + item);
- if (item == mItemPreviewRGBA)
- mView.setViewMode(Sample0View.VIEW_MODE_RGBA);
- else if (item == mItemPreviewGray)
- mView.setViewMode(Sample0View.VIEW_MODE_GRAY);
- return true;
- }
}
diff --git a/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/SampleViewBase.java b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/SampleViewBase.java
index 79b0d43caa..8db6fae8ac 100644
--- a/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/SampleViewBase.java
+++ b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/SampleViewBase.java
@@ -3,6 +3,7 @@ package org.opencv.samples.tutorial0;
import java.io.IOException;
import java.util.List;
+import android.annotation.TargetApi;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Canvas;
@@ -43,7 +44,8 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde
return mFrameHeight;
}
- public void setPreview() throws IOException {
+ @TargetApi(11)
+ public void setPreview() throws IOException {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
mSf = new SurfaceTexture(10);
mCamera.setPreviewTexture( mSf );
diff --git a/samples/android/tutorial-4-mixed/AndroidManifest.xml b/samples/android/tutorial-4-mixed/AndroidManifest.xml
index 54a172f61f..51460d34b3 100644
--- a/samples/android/tutorial-4-mixed/AndroidManifest.xml
+++ b/samples/android/tutorial-4-mixed/AndroidManifest.xml
@@ -22,7 +22,7 @@
android:largeScreens="true"
android:anyDensity="true" />
-
+
diff --git a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java
index 4a73b7bba7..21acd0c5fd 100644
--- a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java
+++ b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java
@@ -6,7 +6,6 @@ import org.opencv.android.OpenCVLoader;
import org.opencv.core.CvType;
import org.opencv.core.Mat;
import org.opencv.framework.OpenCvJavaCameraView;
-import org.opencv.framework.OpenCvNativeCameraView;
import org.opencv.framework.OpenCvCameraBridgeViewBase.CvCameraViewListener;
import org.opencv.highgui.Highgui;
import org.opencv.imgproc.Imgproc;
@@ -122,8 +121,6 @@ public class Sample4Mixed extends Activity implements CvCameraViewListener {
public Mat onCameraFrame(Mat inputFrame) {
final int viewMode = mViewMode;
- Log.d(TAG, "Input format: " + inputFrame);
-
switch (viewMode) {
case VIEW_MODE_GRAY:
// input frame has gray scale format
@@ -140,15 +137,12 @@ public class Sample4Mixed extends Activity implements CvCameraViewListener {
break;
case VIEW_MODE_FEATURES:
// input frame has RGBA format
- //Imgproc.cvtColor(mYuv, mRgba, Imgproc.COLOR_YUV420sp2RGB, 4);
inputFrame.copyTo(mRgba);
Imgproc.cvtColor(mRgba, mGrayMat, Imgproc.COLOR_RGBA2GRAY);
FindFeatures(mGrayMat.getNativeObjAddr(), mRgba.getNativeObjAddr());
break;
}
- Log.d(TAG, "Output format: " + mRgba);
-
return mRgba;
}