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

Sample Tutorial-5 improved

Browse Source 
Aditional toasts added;
Exception handling improved;
Bitmap recycling added.
This commit is contained in:
Alexander Smorkalov 2012-11-30 18:41:46 +04:00
parent f6ca38a579
commit 22484872fa
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
samples/android/tutorial-5-cameracontrol/src/org/opencv/samples/tutorial5/Sample5CameraControl.java
View File

@ -20,6 +20,7 @@ import android.view.SurfaceView;
import android.view.View; import android.view.View;
import android.view.View.OnTouchListener; import android.view.View.OnTouchListener;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.Toast;
public class Sample5CameraControl extends Activity implements CvCameraViewListener, OnTouchListener { public class Sample5CameraControl extends Activity implements CvCameraViewListener, OnTouchListener {
private static final String TAG = "OCVSample::Activity"; private static final String TAG = "OCVSample::Activity";
@ -100,6 +101,11 @@ public class Sample5CameraControl extends Activity implements CvCameraViewListen
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
List<String> effects = mOpenCvCameraView.getEffectList(); List<String> effects = mOpenCvCameraView.getEffectList();
if (effects == null) {
Log.e(TAG, "Color effects are not supported by device!");
return true;
}
mEffectMenuItems = new MenuItem[effects.size()]; mEffectMenuItems = new MenuItem[effects.size()];
int idx = 0; int idx = 0;
@ -115,13 +121,16 @@ public class Sample5CameraControl extends Activity implements CvCameraViewListen
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
Log.i(TAG, "called onOptionsItemSelected; selected item: " + item); Log.i(TAG, "called onOptionsItemSelected; selected item: " + item);
mOpenCvCameraView.setEffect((String) item.getTitle()); mOpenCvCameraView.setEffect((String) item.getTitle());
Toast.makeText(this, mOpenCvCameraView.getEffect(), Toast.LENGTH_SHORT).show();
return true; return true;
} }
@Override @Override
public boolean onTouch(View v, MotionEvent event) { public boolean onTouch(View v, MotionEvent event) {
Log.i(TAG,"onTouch event"); Log.i(TAG,"onTouch event");
mOpenCvCameraView.takePicture(Environment.getExternalStorageDirectory().getPath() + "/sample_picture.jpg"); String fileName = Environment.getExternalStorageDirectory().getPath() + "/sample_picture.jpg";
mOpenCvCameraView.takePicture(fileName);
Toast.makeText(this, fileName + " saved", Toast.LENGTH_SHORT).show();
return false; return false;
} }
} }

5
samples/android/tutorial-5-cameracontrol/src/org/opencv/samples/tutorial5/SampleJavaCameraView.java
View File

@ -25,6 +25,10 @@ public class SampleJavaCameraView extends JavaCameraView {
return mCamera.getParameters().getSupportedColorEffects(); return mCamera.getParameters().getSupportedColorEffects();
} }
public boolean isEffectSupported() {
return (mCamera.getParameters().getColorEffect() != null);
}
public String getEffect() { public String getEffect() {
return mCamera.getParameters().getColorEffect(); return mCamera.getParameters().getColorEffect();
} }
@ -48,6 +52,7 @@ public class SampleJavaCameraView extends JavaCameraView {
try { try {
FileOutputStream out = new FileOutputStream(mPictureFileName); FileOutputStream out = new FileOutputStream(mPictureFileName);
picture.compress(Bitmap.CompressFormat.JPEG, 90, out); picture.compress(Bitmap.CompressFormat.JPEG, 90, out);
picture.recycle();
mCamera.startPreview(); mCamera.startPreview();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();