mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 03:30:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Applying patch mentioned in ticket #1085

Browse Source
This commit is contained in:
Ethan Rublee 2011-05-23 19:52:23 +00:00
parent 7fbcc1ec05
commit 72728b4481
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
android/android-opencv/src/com/opencv/camera/NativePreviewer.java
View File

@ -153,35 +153,28 @@ public class NativePreviewer extends SurfaceView implements
Log.d("NativePreviewer", "Supported params: "
+ mCamera.getParameters().flatten());
// this is available in 8+
// parameters.setExposureCompensation(0);
if (parameters.getSupportedWhiteBalance().contains(whitebalance_mode)) {
List<String> whiteBalanceModes = parameters.getSupportedWhiteBalance();
if (whiteBalanceModes != null
&& whiteBalanceModes.contains(whitebalance_mode) ) {
parameters.setWhiteBalance(whitebalance_mode);
}
// if (parameters.getSupportedAntibanding().contains(
// Camera.Parameters.ANTIBANDING_OFF)) {
// parameters.setAntibanding(Camera.Parameters.ANTIBANDING_OFF);
// }
List<String> fmodes = mCamera.getParameters().getSupportedFocusModes();
// for(String x: fmodes){
// }
if (parameters.get("meter-mode") != null)
parameters.set("meter-mode", "meter-average");
int idx = fmodes.indexOf(Camera.Parameters.FOCUS_MODE_INFINITY);
if (idx != -1) {
parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_INFINITY);
} else if (fmodes.indexOf(Camera.Parameters.FOCUS_MODE_FIXED) != -1) {
parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_FIXED);
}
if (fmodes.indexOf(Camera.Parameters.FOCUS_MODE_AUTO) != -1) {
hasAutoFocus = true;
List<String> fmodes = mCamera.getParameters().getSupportedFocusModes();
if(fmodes != null)
{
int idx = fmodes.indexOf(Camera.Parameters.FOCUS_MODE_INFINITY);
if (idx != -1) {
parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_INFINITY);
} else if (fmodes.indexOf(Camera.Parameters.FOCUS_MODE_FIXED) != -1) {
parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_FIXED);
}
if (fmodes.indexOf(Camera.Parameters.FOCUS_MODE_AUTO) != -1) {
hasAutoFocus = true;
}
}
List<String> scenemodes = mCamera.getParameters()
@ -211,7 +204,7 @@ public class NativePreviewer extends SurfaceView implements
initForACB();
initForPCWB();
// Use only one buffer, so that we don't preview to many frames and bog
// Use only one buffer, so that we don't preview too many frames and bog
// down system
byte[] buffer = new byte[bufSize];
addCallbackBuffer(buffer);
@ -479,4 +472,5 @@ public class NativePreviewer extends SurfaceView implements
}
}
}