From 74749fccbf507ea72af4bc9e0e778eb96f1dcfd2 Mon Sep 17 00:00:00 2001 From: Andrey Pavlenko Date: Wed, 28 Mar 2012 15:32:01 +0000 Subject: [PATCH] fix for #1724: making Java samples compatible with Android 3.1+ targets --- .../opencv/samples/tutorial0/SampleViewBase.java | 21 ++++++++++++--------- .../opencv/samples/tutorial1/SampleViewBase.java | 21 ++++++++++++--------- .../opencv/samples/tutorial3/SampleViewBase.java | 21 ++++++++++++--------- .../opencv/samples/tutorial4/SampleViewBase.java | 21 ++++++++++++--------- 4 files changed, 48 insertions(+), 36 deletions(-) diff --git a/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/SampleViewBase.java b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/SampleViewBase.java index aab549a..ecf30c6 100644 --- a/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/SampleViewBase.java +++ b/samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/SampleViewBase.java @@ -39,6 +39,13 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde 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) { Log.i(TAG, "surfaceCreated"); if (mCamera != null) { @@ -61,15 +68,11 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde params.setPreviewSize(getFrameWidth(), getFrameHeight()); mCamera.setParameters(params); - 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); - } - } + try { + setPreview(); + } catch (IOException e) { + Log.e(TAG, "mCamera.setPreviewDisplay/setPreviewTexture fails: " + e); + } mCamera.startPreview(); } } diff --git a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/SampleViewBase.java b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/SampleViewBase.java index 8e53383..f9ebdfc 100644 --- a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/SampleViewBase.java +++ b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/SampleViewBase.java @@ -39,6 +39,13 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde 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) { Log.i(TAG, "surfaceCreated"); if (mCamera != null) { @@ -61,15 +68,11 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde params.setPreviewSize(getFrameWidth(), getFrameHeight()); mCamera.setParameters(params); - 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); - } - } + try { + setPreview(); + } catch (IOException e) { + Log.e(TAG, "mCamera.setPreviewDisplay/setPreviewTexture fails: " + e); + } mCamera.startPreview(); } } diff --git a/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/SampleViewBase.java b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/SampleViewBase.java index 81e192a..71df0f8 100644 --- a/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/SampleViewBase.java +++ b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/SampleViewBase.java @@ -39,6 +39,13 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde 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) { Log.i(TAG, "surfaceCreated"); if (mCamera != null) { @@ -61,15 +68,11 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde params.setPreviewSize(getFrameWidth(), getFrameHeight()); mCamera.setParameters(params); - 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); - } - } + try { + setPreview(); + } catch (IOException e) { + Log.e(TAG, "mCamera.setPreviewDisplay/setPreviewTexture fails: " + e); + } mCamera.startPreview(); } } diff --git a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/SampleViewBase.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/SampleViewBase.java index d464ba9..87f1cdc 100644 --- a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/SampleViewBase.java +++ b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/SampleViewBase.java @@ -39,6 +39,13 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde 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) { Log.i(TAG, "surfaceCreated"); if (mCamera != null) { @@ -61,15 +68,11 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde params.setPreviewSize(getFrameWidth(), getFrameHeight()); mCamera.setParameters(params); - 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); - } - } + try { + setPreview(); + } catch (IOException e) { + Log.e(TAG, "mCamera.setPreviewDisplay/setPreviewTexture fails: " + e); + } mCamera.startPreview(); } } -- 2.7.4