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

Java samples updated to be compatible with both old (2.2+) and new (3.0+) Android versions

Browse Source
This commit is contained in:
Andrey Pavlenko
2012-02-24 08:43:11 +00:00
parent b6c2c61ce1
commit 5bea651e81
11 changed files with 87 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/android/tutorial-3-native/project.properties
View File

@@ -1,2 +1,2 @@
# Project target.
target=android-8
target=android-11

16
samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/SampleViewBase.java
View File

@@ -6,8 +6,10 @@ import java.util.List;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.SurfaceTexture;
import android.hardware.Camera;
import android.hardware.Camera.PreviewCallback;
import android.os.Build;
import android.util.Log;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
@@ -59,11 +61,15 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde
params.setPreviewSize(getFrameWidth(), getFrameHeight());
mCamera.setParameters(params);
try {
mCamera.setPreviewDisplay(null);
} catch (IOException e) {
Log.e(TAG, "mCamera.setPreviewDisplay fails: " + e);
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
mCamera.setPreviewTexture( new SurfaceTexture(10) );
} else {
try {
mCamera.setPreviewDisplay(null);
} catch (IOException e) {
Log.e(TAG, "mCamera.setPreviewDisplay fails: " + e);
}
}
mCamera.startPreview();
}
}