generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed Android samples; Fixed bugs in cmake (java module).

Browse Source
This commit is contained in:
Andrey Kamaev
2011-07-19 17:07:01 +00:00
parent fd4fe3ef5a
commit 930b2995eb
17 changed files with 183 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
samples/android/face-detection/src/org/opencv/samples/fd/FdView.java
View File

@@ -7,7 +7,14 @@ import java.io.InputStream;
import java.util.LinkedList;
import java.util.List;
import org.opencv.*;
import org.opencv.android;
import org.opencv.core.Core;
import org.opencv.core.Mat;
import org.opencv.core.Rect;
import org.opencv.core.Scalar;
import org.opencv.core.Size;
import org.opencv.highgui.Highgui;
import org.opencv.highgui.VideoCapture;
import org.opencv.objdetect.CascadeClassifier;
import android.content.Context;
@@ -68,8 +75,8 @@ class FdView extends SampleCvViewBase {
@Override
protected Bitmap processFrame(VideoCapture capture) {
capture.retrieve(mRgba, highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA);
capture.retrieve(mGray, highgui.CV_CAP_ANDROID_GREY_FRAME);
capture.retrieve(mRgba, Highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA);
capture.retrieve(mGray, Highgui.CV_CAP_ANDROID_GREY_FRAME);
if (mCascade != null) {
int height = mGray.rows();
@@ -79,7 +86,7 @@ class FdView extends SampleCvViewBase {
, new Size(faceSize, faceSize));
for (Rect r : faces)
core.rectangle(mRgba, r.tl(), r.br(), new Scalar(0, 255, 0, 255), 3);
Core.rectangle(mRgba, r.tl(), r.br(), new Scalar(0, 255, 0, 255), 3);
}
Bitmap bmp = Bitmap.createBitmap(mRgba.cols(), mRgba.rows(), Bitmap.Config.ARGB_8888);

8
samples/android/face-detection/src/org/opencv/samples/fd/FpsMeter.java
View File

@@ -2,7 +2,7 @@ package org.opencv.samples.fd;
import java.text.DecimalFormat;
import org.opencv.core;
import org.opencv.core.Core;
import android.graphics.Canvas;
import android.graphics.Color;
@@ -22,8 +22,8 @@ public class FpsMeter {
public void init() {
step = 20;
framesCouner = 0;
freq = core.getTickFrequency();
prevFrameTime = core.getTickCount();
freq = Core.getTickFrequency();
prevFrameTime = Core.getTickCount();
strfps = "";
paint = new Paint();
@@ -34,7 +34,7 @@ public class FpsMeter {
public void measure() {
framesCouner++;
if (framesCouner % step == 0) {
long time = core.getTickCount();
long time = Core.getTickCount();
double fps = step * freq / (time - prevFrameTime);
prevFrameTime = time;
DecimalFormat twoPlaces = new DecimalFormat("0.00");

10
samples/android/face-detection/src/org/opencv/samples/fd/SampleCvViewBase.java
View File

@@ -2,7 +2,9 @@ package org.opencv.samples.fd;
import java.util.List;
import org.opencv.*;
import org.opencv.core.Size;
import org.opencv.highgui.VideoCapture;
import org.opencv.highgui.Highgui;
import android.content.Context;
import android.graphics.Bitmap;
@@ -48,15 +50,15 @@ public abstract class SampleCvViewBase extends SurfaceView implements SurfaceHol
}
}
mCamera.set(highgui.CV_CAP_PROP_FRAME_WIDTH, mFrameWidth);
mCamera.set(highgui.CV_CAP_PROP_FRAME_HEIGHT, mFrameHeight);
mCamera.set(Highgui.CV_CAP_PROP_FRAME_WIDTH, mFrameWidth);
mCamera.set(Highgui.CV_CAP_PROP_FRAME_HEIGHT, mFrameHeight);
}
}
}
public void surfaceCreated(SurfaceHolder holder) {
Log.i(TAG, "surfaceCreated");
mCamera = new VideoCapture(highgui.CV_CAP_ANDROID);
mCamera = new VideoCapture(Highgui.CV_CAP_ANDROID);
if (mCamera.isOpened()) {
(new Thread(this)).start();
} else {