Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix OutOfMemory bug #15

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

fix OutOfMemory bug #15

Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
6fac275
add an example code
hnvn Apr 10, 2017
2532b2f
change package name
hnvn Apr 10, 2017
aab69bc
ignore some files
hnvn Apr 10, 2017
4fb194d
fix bugs
hnvn Apr 10, 2017
abf32c4
remove .idea folder
hnvn Apr 11, 2017
110479f
remove .idea folder from repository
hnvn Apr 11, 2017
e2a1d9b
+ fix bugs
hnvn Apr 17, 2017
378349d
change folder name to “JavaCV-android-preview-example”
hnvn Apr 18, 2017
86d597a
+ change something
hnvn Apr 24, 2017
be3cb2b
+ fix typing error
hnvn Apr 24, 2017
036ca1d
Remove unused folders from repository
hnvn Apr 24, 2017
1b6872e
add licence information for CvCameraPreview class
hnvn Apr 25, 2017
0771df5
fix OutOfMemory bug
hnvn Apr 27, 2017
f954471
Delete .gitignore
hnvn Apr 27, 2017
8bf3864
change name project
hnvn Apr 27, 2017
c803dce
-fix OutOfMemory bug
hnvn May 14, 2017
3f28906
Merge branch 'master' into android
hnvn May 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
170 changes: 86 additions & 84 deletions ...camera-preview/app/src/main/java/org/bytedeco/javacv/android/example/CvCameraPreview.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.bytedeco.javacv.android.example;

import android.app.Activity;
Expand All @@ -22,7 +23,9 @@
import android.content.res.TypedArray;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.ImageFormat;
import android.graphics.Paint;
import android.graphics.Rect;
import android.graphics.SurfaceTexture;
import android.hardware.Camera;
Expand All @@ -38,16 +41,18 @@

import org.bytedeco.javacpp.opencv_core.Mat;
import org.bytedeco.javacv.AndroidFrameConverter;
import org.bytedeco.javacv.FFmpegFrameFilter;
import org.bytedeco.javacv.Frame;
import org.bytedeco.javacv.FrameFilter;
import org.bytedeco.javacv.OpenCVFrameConverter;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.List;

import static org.bytedeco.javacpp.avutil.AV_PIX_FMT_NV21;
import static org.bytedeco.javacpp.opencv_core.CV_8UC4;
import static org.bytedeco.javacpp.opencv_core.flip;
import static org.bytedeco.javacpp.opencv_core.transpose;
import static org.bytedeco.javacpp.opencv_imgproc.COLOR_YUV2RGBA_NV21;
import static org.bytedeco.javacpp.opencv_imgproc.cvtColor;

/**
* This is the graphical object used to display a real-time preview of the Camera.
Expand Down Expand Up @@ -111,16 +116,15 @@ public class CvCameraPreview extends SurfaceView implements SurfaceHolder.Callba
*/
private SurfaceHolder surfaceHolder;

private FFmpegFrameFilter filter;
private int chainIdx = 0;
private boolean stopThread = false;
private boolean cameraFrameReady = false;
protected boolean enabled = true;
private boolean surfaceExist;
private Thread thread;
private CvCameraViewListener listener;
private AndroidFrameConverter converterToBitmap = new AndroidFrameConverter();
private OpenCVFrameConverter.ToMat converterToMat = new OpenCVFrameConverter.ToMat();
private AndroidFrameConverter converterToBitmap;
private OpenCVFrameConverter.ToMat converterToMat;
private Bitmap cacheBitmap;
protected Frame[] cameraFrame;
private int state = STOPPED;
Expand All @@ -131,6 +135,13 @@ public class CvCameraPreview extends SurfaceView implements SurfaceHolder.Callba
private SurfaceTexture surfaceTexture;
private int frameWidth, frameHeight;
private int scaleType = SCALE_FIT;
private long lastTimeGrabFrame;
private long lastTimeGrabFps;
private Paint fpsPaint;
private boolean showFps;
private long lastFps;
private int rotateDegree;
private boolean isFrontFaceCamera;

public CvCameraPreview(Context context, AttributeSet attrs) {
super(context, attrs);
Expand All @@ -150,8 +161,15 @@ public CvCameraPreview(Context context, int camType, int scaleType) {
initializer(camType == CAMERA_BACK ? Camera.CameraInfo.CAMERA_FACING_BACK : Camera.CameraInfo.CAMERA_FACING_FRONT, scaleType);
}

private void initializer(int camType, int scaleType) {
public void setEnableFpsMeter(boolean enabled) {
showFps = enabled;
}

private void initializer(int camType, int scaleType) {
this.fpsPaint = new Paint();
this.fpsPaint.setColor(Color.CYAN);
this.fpsPaint.setTextSize(40);

this.surfaceHolder = this.getHolder();
this.surfaceHolder.addCallback(this);

Expand All @@ -172,6 +190,20 @@ public int getCameraId() {
return cameraId;
}

public void start() {
synchronized (syncObject) {
surfaceExist = true;
checkCurrentState();
}
}

public void stop() {
synchronized (syncObject) {
surfaceExist = false;
checkCurrentState();
}
}

/**
* Called when the surface is created for the first time. It sets all the
* required {@link #cameraDevice}'s parameters and starts the preview stream.
Expand Down Expand Up @@ -301,13 +333,6 @@ private void onExitStartedState() {
if (cacheBitmap != null) {
cacheBitmap.recycle();
}
if (filter != null) {
try {
filter.release();
} catch (FrameFilter.Exception e) {
e.printStackTrace();
}
}
}

@Override
Expand Down Expand Up @@ -377,7 +402,7 @@ private boolean connectCamera() {

private void disconnectCamera() {
/* 1. We need to stop thread which updating the frames
* 2. Stop camera and release it
* 2. Stop camera and stop it
*/
Log.d(LOG_TAG, "Disconnecting from camera");
try {
Expand All @@ -397,7 +422,7 @@ private void disconnectCamera() {

stopCameraPreview();

/* Now release camera */
/* Now stop camera */
releaseCamera();

cameraFrameReady = false;
Expand Down Expand Up @@ -468,7 +493,18 @@ private boolean initializeCamera() {

updateCameraDisplayOrientation();

initFilter(frameWidth, frameHeight);
converterToBitmap = new AndroidFrameConverter();
converterToMat = new OpenCVFrameConverter.ToMat();

if (cameraFrame == null) {
cameraFrame = new Frame[2];
cameraFrame[0] = new Frame(frameWidth, frameHeight + frameHeight / 2, Frame.DEPTH_UBYTE, 1);
cameraFrame[1] = new Frame(frameWidth, frameHeight + frameHeight / 2, Frame.DEPTH_UBYTE, 1);
}

Camera.CameraInfo info = new Camera.CameraInfo();
Camera.getCameraInfo(cameraId, info);
isFrontFaceCamera = info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT;

startCameraPreview(this.surfaceHolder);
}
Expand Down Expand Up @@ -636,9 +672,9 @@ private void updateCameraDisplayOrientation() {
return;
}

int degree = getRotationDegree();
rotateDegree = getRotationDegree();

cameraDevice.setDisplayOrientation(degree); // save settings
cameraDevice.setDisplayOrientation(rotateDegree); // save settings
}

private int getRotationDegree() {
Expand Down Expand Up @@ -684,50 +720,6 @@ private int getRotationDegree() {
return result;
}

private void initFilter(int width, int height) {
int degree = getRotationDegree();
Camera.CameraInfo info = new Camera.CameraInfo();
Camera.getCameraInfo(cameraId, info);
boolean isFrontFaceCamera = info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT;
Log.i(LOG_TAG, "init filter with width = " + width + " and height = " + height + " and degree = "
+ degree + " and isFrontFaceCamera = " + isFrontFaceCamera);
String transposeCode;
String formatCode = "format=pix_fmts=rgba";
/*
0 = 90CounterCLockwise and Vertical Flip (default)
1 = 90Clockwise
2 = 90CounterClockwise
3 = 90Clockwise and Vertical Flip
*/
switch (degree) {
case 0:
transposeCode = isFrontFaceCamera ? "transpose=3,transpose=2" : "transpose=1,transpose=2";
break;
case 90:
transposeCode = isFrontFaceCamera ? "transpose=3" : "transpose=1";
break;
case 180:
transposeCode = isFrontFaceCamera ? "transpose=0,transpose=2" : "transpose=2,transpose=2";
break;
case 270:
transposeCode = isFrontFaceCamera ? "transpose=0" : "transpose=2";
break;
default:
transposeCode = isFrontFaceCamera ? "transpose=3,transpose=2" : "transpose=1,transpose=2";
}

if (cameraFrame == null) {
cameraFrame = new Frame[2];
cameraFrame[0] = new Frame(width, height, Frame.DEPTH_UBYTE, 2);
cameraFrame[1] = new Frame(width, height, Frame.DEPTH_UBYTE, 2);
}

filter = new FFmpegFrameFilter(transposeCode + "," + formatCode, width, height);
filter.setPixelFormat(AV_PIX_FMT_NV21);

Log.i(LOG_TAG, "filter initialize success");
}

@Override
public void onPreviewFrame(byte[] raw, Camera cam) {
processFrame(previewBuffer, cam);
Expand Down Expand Up @@ -777,17 +769,7 @@ public void run() {

if (!stopThread && hasFrame) {
if (cameraFrame[1 - chainIdx] != null) {
try {
Frame frame;
filter.start();
filter.push(cameraFrame[1 - chainIdx]);
while ((frame = filter.pull()) != null) {
deliverAndDrawFrame(frame);
}
filter.stop();
} catch (FrameFilter.Exception e) {
e.printStackTrace();
}
deliverAndDrawFrame(cameraFrame[1 - chainIdx]);
}
}
} while (!stopThread);
Expand All @@ -803,21 +785,39 @@ public void run() {
* @param frame - the current frame to be delivered
*/
protected void deliverAndDrawFrame(Frame frame) {
Mat processedMat = null;
Mat yuvMat = converterToMat.convert(frame);
Mat rgbaMat = new Mat(frameWidth, frameHeight, CV_8UC4);
cvtColor(yuvMat, rgbaMat, COLOR_YUV2RGBA_NV21, 4);

if (rotateDegree == 90) {
transpose(rgbaMat, rgbaMat);
flip(rgbaMat, rgbaMat, isFrontFaceCamera ? -1 : 1);
} else if (rotateDegree == 180 && isFrontFaceCamera) {
flip(rgbaMat, rgbaMat, 0);
} else if (rotateDegree == 270) {
transpose(rgbaMat, rgbaMat);
flip(rgbaMat, rgbaMat, isFrontFaceCamera ? 0 : 1);
} else if (isFrontFaceCamera) {
flip(rgbaMat, rgbaMat, 1);
}

if (listener != null) {
Mat mat = converterToMat.convert(frame);
processedMat = listener.onCameraFrame(mat);
Mat processedMat = listener.onCameraFrame(rgbaMat);
frame = converterToMat.convert(processedMat);
if (mat != null) {
mat.release();
}
} else {
frame = converterToMat.convert(rgbaMat);
}
cacheBitmap = converterToBitmap.convert(frame);
if (cacheBitmap != null) {
int width, height;
Canvas canvas = getHolder().lockCanvas();
if (canvas != null) {
if (lastTimeGrabFrame > 0 && System.currentTimeMillis() - lastTimeGrabFps > 1000) {
lastTimeGrabFps = System.currentTimeMillis();
lastFps = 1000 / (System.currentTimeMillis() - lastTimeGrabFrame);

}
lastTimeGrabFrame = System.currentTimeMillis();
width = canvas.getWidth();
height = cacheBitmap.getHeight() * canvas.getWidth() / cacheBitmap.getWidth();
canvas.drawColor(0, android.graphics.PorterDuff.Mode.CLEAR);
Expand All @@ -827,13 +827,15 @@ protected void deliverAndDrawFrame(Frame frame) {
(canvas.getHeight() - height) / 2,
width,
(canvas.getHeight() - height) / 2 + height), null);
if (showFps) {
canvas.drawText("FPS: " + lastFps, 50, 50, fpsPaint);
}
getHolder().unlockCanvasAndPost(canvas);
}
}

if (processedMat != null) {
processedMat.release();
}

yuvMat.release();
rgbaMat.release();
}

public interface CvCameraViewListener {
Expand Down