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

optimizing calibration for android

Browse Source
This commit is contained in:
Ethan Rublee 2010-11-28 21:24:11 +00:00
parent 56313594b8
commit 120a3b75fc
5 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
android/android-jni/jni/Calibration.cpp
View File

@ -160,34 +160,9 @@ bool Calibration::detectAndDrawChessboard(int idx, image_pool* pool)
if (grey.empty())
return false;
vector<Point2f> corners;
IplImage iplgrey = grey;
patternfound = cvCheckChessboard(&iplgrey, patternsize);
if (!patternfound)
return false;
float factor = grey.cols / 320.0f;
if (factor < 1)
factor = 1;
cv::Size r_size = cv::Size(grey.cols / factor, grey.rows / factor);
Mat grey_sub;
while (patternfound && (r_size.width < grey.size().width))
{
cv::resize(grey, grey_sub, r_size);
patternfound = findChessboardCorners(grey_sub, patternsize, corners);
if (patternfound)
{
r_size.width *= 2;
r_size.height *= 2;
}
else
{
return false;
}
}
// hopefully if we're going to fail we fail on a smaller size image in the while-loop
patternfound = findChessboardCorners(grey, patternsize, corners);
patternfound = findChessboardCorners(grey, patternsize, corners,CALIB_CB_FILTER_QUADS + CALIB_CB_ADAPTIVE_THRESH + CALIB_CB_NORMALIZE_IMAGE
+ CALIB_CB_FAST_CHECK);
Mat img = pool->getImage(idx);
if (corners.size() < 1)

1
android/android-jni/res/values/chessnumbers.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="chesssizes">
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>

2
android/android-jni/res/values/settingnumbers.xml
View File

@ -3,7 +3,7 @@
<string-array name="image_sizes">
<item>320x240</item>
<item>400x300</item>
<item>600x400</item>
<item>640x480</item>
<item>800x600</item>
<item>1000x800</item>
</string-array>

2
android/android-jni/src/com/opencv/calibration/ChessBoardChooser.java
View File

@ -17,7 +17,7 @@ public class ChessBoardChooser extends Activity {
public static final String CHESS_SIZE = "chess_size";
public static final int DEFAULT_WIDTH = 6;
public static final int DEFAULT_HEIGHT = 8;
public static final int LOWEST = 3;
public static final int LOWEST = 2;
class DimChooser implements OnItemSelectedListener {
private String dim;

4
android/android-jni/src/com/opencv/camera/CameraConfig.java
View File

@ -51,8 +51,8 @@ public class CameraConfig extends Activity {
// Restore preferences
SharedPreferences settings = ctx.getSharedPreferences(CAMERA_SETTINGS,
0);
size[0] = settings.getInt(IMAGE_WIDTH, 600);
size[1] = settings.getInt(IMAGE_HEIGHT, 400);
size[0] = settings.getInt(IMAGE_WIDTH, 640);
size[1] = settings.getInt(IMAGE_HEIGHT, 480);
}