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

fix for #1724: making Java samples compatible with Android 3.1+ targets

Browse Source
This commit is contained in:
Andrey Pavlenko 2012-03-28 15:32:01 +00:00
parent cff117c08b
commit 74749fccbf
4 changed files with 48 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/SampleViewBase.java
View File

@ -39,6 +39,13 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde
return mFrameHeight; return mFrameHeight;
} }
public void setPreview() throws IOException {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
mCamera.setPreviewTexture( new SurfaceTexture(10) );
else
mCamera.setPreviewDisplay(null);
}
public void surfaceChanged(SurfaceHolder _holder, int format, int width, int height) { public void surfaceChanged(SurfaceHolder _holder, int format, int width, int height) {
Log.i(TAG, "surfaceCreated"); Log.i(TAG, "surfaceCreated");
if (mCamera != null) { if (mCamera != null) {
@ -61,15 +68,11 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde
params.setPreviewSize(getFrameWidth(), getFrameHeight()); params.setPreviewSize(getFrameWidth(), getFrameHeight());
mCamera.setParameters(params); mCamera.setParameters(params);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { try {
mCamera.setPreviewTexture( new SurfaceTexture(10) ); setPreview();
} else { } catch (IOException e) {
try { Log.e(TAG, "mCamera.setPreviewDisplay/setPreviewTexture fails: " + e);
mCamera.setPreviewDisplay(null); }
} catch (IOException e) {
Log.e(TAG, "mCamera.setPreviewDisplay fails: " + e);
}
}
mCamera.startPreview(); mCamera.startPreview();
} }
} }

21
samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/SampleViewBase.java
View File

@ -39,6 +39,13 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde
return mFrameHeight; return mFrameHeight;
} }
public void setPreview() throws IOException {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
mCamera.setPreviewTexture( new SurfaceTexture(10) );
else
mCamera.setPreviewDisplay(null);
}
public void surfaceChanged(SurfaceHolder _holder, int format, int width, int height) { public void surfaceChanged(SurfaceHolder _holder, int format, int width, int height) {
Log.i(TAG, "surfaceCreated"); Log.i(TAG, "surfaceCreated");
if (mCamera != null) { if (mCamera != null) {
@ -61,15 +68,11 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde
params.setPreviewSize(getFrameWidth(), getFrameHeight()); params.setPreviewSize(getFrameWidth(), getFrameHeight());
mCamera.setParameters(params); mCamera.setParameters(params);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { try {
mCamera.setPreviewTexture( new SurfaceTexture(10) ); setPreview();
} else { } catch (IOException e) {
try { Log.e(TAG, "mCamera.setPreviewDisplay/setPreviewTexture fails: " + e);
mCamera.setPreviewDisplay(null); }
} catch (IOException e) {
Log.e(TAG, "mCamera.setPreviewDisplay fails: " + e);
}
}
mCamera.startPreview(); mCamera.startPreview();
} }
} }

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

@ -39,6 +39,13 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde
return mFrameHeight; return mFrameHeight;
} }
public void setPreview() throws IOException {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
mCamera.setPreviewTexture( new SurfaceTexture(10) );
else
mCamera.setPreviewDisplay(null);
}
public void surfaceChanged(SurfaceHolder _holder, int format, int width, int height) { public void surfaceChanged(SurfaceHolder _holder, int format, int width, int height) {
Log.i(TAG, "surfaceCreated"); Log.i(TAG, "surfaceCreated");
if (mCamera != null) { if (mCamera != null) {
@ -61,15 +68,11 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde
params.setPreviewSize(getFrameWidth(), getFrameHeight()); params.setPreviewSize(getFrameWidth(), getFrameHeight());
mCamera.setParameters(params); mCamera.setParameters(params);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { try {
mCamera.setPreviewTexture( new SurfaceTexture(10) ); setPreview();
} else { } catch (IOException e) {
try { Log.e(TAG, "mCamera.setPreviewDisplay/setPreviewTexture fails: " + e);
mCamera.setPreviewDisplay(null); }
} catch (IOException e) {
Log.e(TAG, "mCamera.setPreviewDisplay fails: " + e);
}
}
mCamera.startPreview(); mCamera.startPreview();
} }
} }

21
samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/SampleViewBase.java
View File

@ -39,6 +39,13 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde
return mFrameHeight; return mFrameHeight;
} }
public void setPreview() throws IOException {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
mCamera.setPreviewTexture( new SurfaceTexture(10) );
else
mCamera.setPreviewDisplay(null);
}
public void surfaceChanged(SurfaceHolder _holder, int format, int width, int height) { public void surfaceChanged(SurfaceHolder _holder, int format, int width, int height) {
Log.i(TAG, "surfaceCreated"); Log.i(TAG, "surfaceCreated");
if (mCamera != null) { if (mCamera != null) {
@ -61,15 +68,11 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde
params.setPreviewSize(getFrameWidth(), getFrameHeight()); params.setPreviewSize(getFrameWidth(), getFrameHeight());
mCamera.setParameters(params); mCamera.setParameters(params);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { try {
mCamera.setPreviewTexture( new SurfaceTexture(10) ); setPreview();
} else { } catch (IOException e) {
try { Log.e(TAG, "mCamera.setPreviewDisplay/setPreviewTexture fails: " + e);
mCamera.setPreviewDisplay(null); }
} catch (IOException e) {
Log.e(TAG, "mCamera.setPreviewDisplay fails: " + e);
}
}
mCamera.startPreview(); mCamera.startPreview();
} }
} }