status-im
/
react-native-camera
mirror of https://github.com/status-im/react-native-camera.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat: added property expectedFaceOrientation and handle it together with image orientation depending on used camera

This commit is contained in:
Malte Peters 2018-02-17 13:03:09 +01:00
parent 7bea109e47
commit 47780e5485
5 changed files with 82 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
android/src/main/java/org/reactnative/camera/CameraViewManager.java
View File

@ -114,6 +114,11 @@ public class CameraViewManager extends ViewGroupManager<RNCameraView> {
view.setShouldScanBarCodes(barCodeScannerEnabled);
}
@ReactProp(name = "faceDetectionExpectedOrientation")
public void setFaceDetectionExpectedOrientation(RNCameraView view, int faceDetectionExpectedOrientation) {
view.setFaceDetectionExpectedOrientation(faceDetectionExpectedOrientation);
}
@ReactProp(name = "faceDetectorEnabled")
public void setFaceDetecting(RNCameraView view, boolean faceDetectorEnabled) {
view.setShouldDetectFaces(faceDetectorEnabled);

12
android/src/main/java/org/reactnative/camera/RNCameraView.java
View File

@ -58,9 +58,10 @@ public class RNCameraView extends CameraView implements LifecycleEventListener,
// Scanning-related properties
private final MultiFormatReader mMultiFormatReader = new MultiFormatReader();
// private final RNFaceDetector mFaceDetector;
// private final RNFaceDetector mFaceDetector;
private boolean mShouldDetectFaces = false;
private boolean mShouldScanBarCodes = false;
private int mFaceDetectionExpectedOrientation = -1;
private int mFaceDetectorMode = RNFaceDetector.FAST_MODE;
private int mFaceDetectionLandmarks = RNFaceDetector.NO_LANDMARKS;
private int mFaceDetectionClassifications = RNFaceDetector.NO_CLASSIFICATIONS;
@ -243,6 +244,13 @@ public class RNCameraView extends CameraView implements LifecycleEventListener,
// mFaceDetector.setTracking(true);
}
public void setFaceDetectionExpectedOrientation(int expectedFaceOrientation) {
mFaceDetectionExpectedOrientation = expectedFaceOrientation;
if (openCVProcessor != null) {
openCVProcessor.setFaceDetectionExpectedOrientation(expectedFaceOrientation);
}
}
public void setFaceDetectionLandmarks(int landmarks) {
mFaceDetectionLandmarks = landmarks;
// if (mFaceDetector != null) {
@ -322,4 +330,4 @@ public class RNCameraView extends CameraView implements LifecycleEventListener,
return true;
}
}
}
}

2
android/src/main/java/org/reactnative/camera/events/OpenCVProcessorFacesDetectedEvent.java
View File

@ -91,7 +91,7 @@ public class OpenCVProcessorFacesDetectedEvent extends Event<OpenCVProcessorFace
serializedFace.putDouble("y", face.get("y"));
serializedFace.putDouble("width", face.get("width"));
serializedFace.putDouble("height", face.get("height"));
serializedFace.putDouble("orientation", 0);
serializedFace.putDouble("orientation", face.get("orientation"));
facesList.pushMap(serializedFace);
}
WritableMap event = Arguments.createMap();

4
android/src/main/java/org/reactnative/camera/tasks/OpenCVProcessorAsyncTask.java
View File

@ -26,7 +26,7 @@ public class OpenCVProcessorAsyncTask extends AsyncTask<Void, Void, SparseArray<
if (isCancelled() || this.mDelegate == null || this.mOpenCVProcessor == null) {
return null;
}
return this.mOpenCVProcessor.detect(this.mImageData, this.mWidth, this.mHeight);
return this.mOpenCVProcessor.detect(this.mImageData, this.mWidth, this.mHeight, this.mRotation);
}
protected void onPostExecute(SparseArray<Map<String, Float>> faces) {
@ -38,4 +38,4 @@ public class OpenCVProcessorAsyncTask extends AsyncTask<Void, Void, SparseArray<
this.mDelegate.onFacesDetected(faces, this.mWidth, this.mHeight, this.mRotation);
this.mDelegate.onFaceDetectingTaskCompleted();
}
}
}

71
android/src/main/java/org/reactnative/opencv/OpenCVProcessor.java
View File

@ -3,6 +3,9 @@ package org.reactnative.opencv;
import android.content.Context;
import android.util.Log;
import android.util.SparseArray;
import android.view.Surface;
import android.view.WindowManager;
import com.facebook.react.common.ReactConstants;
import java.io.File;
import java.io.FileOutputStream;
@ -25,6 +28,7 @@ public class OpenCVProcessor {
private CascadeClassifier faceDetector;
private int frame = 0;
private Context reactContext;
private int faceDetectionExpectedOrientation = -1;
public OpenCVProcessor(Context context) {
this.reactContext = context;
@ -60,7 +64,7 @@ public class OpenCVProcessor {
Imgcodecs.imwrite("/sdcard/nect/" + String.valueOf(System.currentTimeMillis()) + ".jpg", mat);
}
public SparseArray<Map<String, Float>> detect(byte[] imageData, int width, int height) {
public SparseArray<Map<String, Float>> detect(byte[] imageData, int width, int height, int rotation) {
SparseArray<Map<String, Float>> faces = new SparseArray();
if (this.frame % 15 == 0) {
Mat mat = new Mat((height / 2) + height, width, CvType.CV_8UC1);
@ -69,8 +73,56 @@ public class OpenCVProcessor {
Mat grayMat = new Mat();
Imgproc.cvtColor(mat, grayMat, Imgproc.COLOR_YUV2GRAY_420);
Core.transpose(grayMat, grayMat);
Core.flip(grayMat, grayMat, -1);
int imageRotation = 1;
switch(rotation) {
case 90:
imageRotation = 2;
break;
case 180:
imageRotation = 3;
break;
case 270:
imageRotation = 0;
break;
}
int expectedFaceOrientation = 3;
if(faceDetectionExpectedOrientation != -1){
expectedFaceOrientation = faceDetectionExpectedOrientation;
} else {
// rotate image according to device-orientation
WindowManager wManager = (WindowManager) reactContext.getSystemService(reactContext.WINDOW_SERVICE);
int deviceRotation = wManager.getDefaultDisplay().getRotation();
switch (deviceRotation) {
case Surface.ROTATION_0:
expectedFaceOrientation = 0;
break;
case Surface.ROTATION_90:
expectedFaceOrientation = 1;
break;
case Surface.ROTATION_180:
expectedFaceOrientation = 2;
break;
}
}
int rotationToBeApplied = expectedFaceOrientation + imageRotation % 4;
switch(rotationToBeApplied){
case 2:
Core.transpose(grayMat, grayMat);
Core.flip(grayMat, grayMat,1);
break;
case 3:
Core.flip(grayMat, grayMat,-1);
break;
case 0:
Core.transpose(grayMat, grayMat);
Core.flip(grayMat, grayMat,0);
break;
}
float imageWidth = 480f;
float scale = imageWidth / grayMat.cols();
@ -78,13 +130,13 @@ public class OpenCVProcessor {
Imgproc.resize(grayMat, grayMat, new Size(), scale, scale, 2);
if (this.frame == 30) {
// if (this.frame == 30) {
// Log.d(ReactConstants.TAG, "---SAVE IMAGE!!--- ");
// saveMatToDisk(grayMat);
}
// }
MatOfRect rec = new MatOfRect();
this.faceDetector.detectMultiScale(grayMat, rec, 1.2, 3, 0, new Size(10, 10), new Size());
this.faceDetector.detectMultiScale(grayMat, rec, 1.3, 3, 0, new Size(50, 50), new Size());
Rect[] detectedObjects = rec.toArray();
if (detectedObjects.length > 0) {
@ -96,6 +148,7 @@ public class OpenCVProcessor {
face.put("y", detectedObjects[i].y / imageHeight);
face.put("width", detectedObjects[i].width / imageWidth);
face.put("height", detectedObjects[i].height / imageHeight);
face.put("orientation", (float) expectedFaceOrientation);
faces.append(i, face);
}
}
@ -103,4 +156,8 @@ public class OpenCVProcessor {
this.frame++;
return faces;
}
}
public void setFaceDetectionExpectedOrientation(int expectedOrientation){
faceDetectionExpectedOrientation = expectedOrientation;
}
}