mirror of https://github.com/opencv/opencv.git
Alexander Smorkalov
12 years ago
committed by
Andrey Kamaev
parent
cd152c3a03
commit
cc3430dbcc
7 changed files with 188 additions and 205 deletions
@ -1,62 +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.OpenCvCameraBridgeViewBase.CvCameraViewListener; |
||||
|
||||
import android.os.Bundle; |
||||
import android.app.Activity; |
||||
import android.util.Log; |
||||
|
||||
public class CameraWriterActivity extends Activity implements CvCameraViewListener { |
||||
|
||||
protected static final String TAG = "CameraWriterActivity"; |
||||
|
||||
|
||||
private OpenCvCameraBridgeViewBase 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 = (OpenCvCameraBridgeViewBase)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; |
||||
} |
||||
} |
||||
@ -0,0 +1,110 @@ |
||||
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<Size> 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(); |
||||
} |
||||
|
||||
} |
||||
@ -1,125 +0,0 @@ |
||||
package org.opencv.test.camerawriter; |
||||
|
||||
import org.opencv.android.Utils; |
||||
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.graphics.Bitmap; |
||||
import android.graphics.Canvas; |
||||
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 OpenCvNativeCameraView extends OpenCvCameraBridgeViewBase { |
||||
|
||||
public static final String TAG = "OpenCvNativeCameraView"; |
||||
private boolean mStopThread; |
||||
private Thread mThread; |
||||
private VideoCapture mCamera; |
||||
|
||||
|
||||
public OpenCvNativeCameraView(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(getWidth(), getHeight())); |
||||
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<Size> 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 { |
||||
|
||||
private Mat mRgba = new Mat(); |
||||
private int mWidth; |
||||
private int mHeight; |
||||
|
||||
CameraWorker(int w, int h) { |
||||
mWidth = w; |
||||
mHeight = h; |
||||
} |
||||
|
||||
public void run() { |
||||
Mat modified; |
||||
|
||||
|
||||
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); |
||||
|
||||
} |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,60 @@ |
||||
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; |
||||
} |
||||
} |
||||
Loading…
Reference in new issue