mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
add support for neighborhood estimation and version guessing
This commit is contained in:
parent
45b5dc1d95
commit
8002d522b0
1 changed files with 118 additions and 8 deletions
|
|
@ -177,9 +177,9 @@ fn point_from_hv_lines(hline: &LineDerivation, vline: &LineDerivation) -> Option
|
||||||
}
|
}
|
||||||
|
|
||||||
// Threshold to reject points if they don't fit on the best-fit line
|
// Threshold to reject points if they don't fit on the best-fit line
|
||||||
const OUTLIER_THRESHOLD: f32 = 1.0;
|
const OUTLIER_THRESHOLD: f32 = 0.5;
|
||||||
const OUTLIER_ITERS: usize = 5;
|
const OUTLIER_ITERS: usize = 5;
|
||||||
#[derive(Copy, Clone)]
|
#[derive(Clone)]
|
||||||
pub struct LineDerivation {
|
pub struct LineDerivation {
|
||||||
pub equation: Option<(f32, f32)>,
|
pub equation: Option<(f32, f32)>,
|
||||||
pub independent_axis: Axis,
|
pub independent_axis: Axis,
|
||||||
|
|
@ -277,6 +277,8 @@ pub struct QrCorners {
|
||||||
height: isize,
|
height: isize,
|
||||||
derived_corner: Direction,
|
derived_corner: Direction,
|
||||||
finder_width: usize,
|
finder_width: usize,
|
||||||
|
// destination QR image in pixels per side (as a perfect square)
|
||||||
|
dst_pixels: usize,
|
||||||
}
|
}
|
||||||
impl QrCorners {
|
impl QrCorners {
|
||||||
pub fn from_finders(points: &[Point; 3], dimensions: Point, finder_width: usize) -> Option<Self> {
|
pub fn from_finders(points: &[Point; 3], dimensions: Point, finder_width: usize) -> Option<Self> {
|
||||||
|
|
@ -287,6 +289,7 @@ impl QrCorners {
|
||||||
qrc.width = dimensions.x;
|
qrc.width = dimensions.x;
|
||||||
qrc.height = dimensions.y;
|
qrc.height = dimensions.y;
|
||||||
qrc.finder_width = finder_width;
|
qrc.finder_width = finder_width;
|
||||||
|
qrc.dst_pixels = dimensions.x.min(dimensions.y) as usize;
|
||||||
|
|
||||||
for &p in points {
|
for &p in points {
|
||||||
if p.x < x_half && p.y < y_half {
|
if p.x < x_half && p.y < y_half {
|
||||||
|
|
@ -402,12 +405,26 @@ impl QrCorners {
|
||||||
/// was made, with a margin added.
|
/// was made, with a margin added.
|
||||||
///
|
///
|
||||||
/// The margin should be negative for the corners to go in toward the center.
|
/// The margin should be negative for the corners to go in toward the center.
|
||||||
|
///
|
||||||
|
/// Canonical orientation for QR code should be like this:
|
||||||
|
/// +------+
|
||||||
|
/// |O .|
|
||||||
|
/// | |
|
||||||
|
/// ^ |O O|
|
||||||
|
/// | +______+
|
||||||
|
/// (0,0) ->
|
||||||
|
///
|
||||||
|
/// Thus we want to orient so the discovered corner is in the NorthEast direction.
|
||||||
pub fn mapping(&mut self, ir: &mut ImageRoi, margin: isize) -> ([Option<Point>; 4], [Option<Point>; 4]) {
|
pub fn mapping(&mut self, ir: &mut ImageRoi, margin: isize) -> ([Option<Point>; 4], [Option<Point>; 4]) {
|
||||||
|
// adjust the final target image size by the specified margin
|
||||||
|
self.dst_pixels = (self.dst_pixels as isize + 2 * margin) as usize;
|
||||||
|
|
||||||
// first, search for the lines that define the outline of the QR code
|
// first, search for the lines that define the outline of the QR code
|
||||||
self.outline_search(ir);
|
self.outline_search(ir);
|
||||||
|
|
||||||
let mut src = [None; 4];
|
let mut src = [None; 4];
|
||||||
let mut dst = [None; 4];
|
let mut dst = [None; 4];
|
||||||
|
let mut uk_direction: Option<Direction> = None;
|
||||||
|
|
||||||
for (i, corner) in self.corners.iter().enumerate() {
|
for (i, corner) in self.corners.iter().enumerate() {
|
||||||
if let Some(_p) = corner.finder_ref {
|
if let Some(_p) = corner.finder_ref {
|
||||||
|
|
@ -415,6 +432,7 @@ impl QrCorners {
|
||||||
// derive the corner from the extracted h and v lines along the finder pattern
|
// derive the corner from the extracted h and v lines along the finder pattern
|
||||||
src[i] = point_from_hv_lines(&corner.h_line, &corner.v_line);
|
src[i] = point_from_hv_lines(&corner.h_line, &corner.v_line);
|
||||||
} else {
|
} else {
|
||||||
|
uk_direction = Direction::try_from(i).ok();
|
||||||
// This is the unknown corner:
|
// This is the unknown corner:
|
||||||
// derive the corner from the h and v lines from the nearest finders' lines
|
// derive the corner from the h and v lines from the nearest finders' lines
|
||||||
let h_line = match Direction::try_from(i) {
|
let h_line = match Direction::try_from(i) {
|
||||||
|
|
@ -431,19 +449,39 @@ impl QrCorners {
|
||||||
Ok(Direction::SouthEast) => &self.corners[Direction::NorthEast as usize].v_line,
|
Ok(Direction::SouthEast) => &self.corners[Direction::NorthEast as usize].v_line,
|
||||||
_ => panic!("Bad index"),
|
_ => panic!("Bad index"),
|
||||||
};
|
};
|
||||||
|
// draw_line(debug, &h_line, [255, 255, 0]);
|
||||||
|
// draw_line(debug, &v_line, [255, 255, 0]);
|
||||||
src[i] = point_from_hv_lines(h_line, v_line);
|
src[i] = point_from_hv_lines(h_line, v_line);
|
||||||
}
|
}
|
||||||
|
let min = -margin;
|
||||||
|
let max = self.dst_pixels as isize + margin;
|
||||||
dst[i] = match Direction::try_from(i) {
|
dst[i] = match Direction::try_from(i) {
|
||||||
Ok(Direction::NorthWest) => Some(Point::new(-margin, self.height + margin)),
|
Ok(Direction::NorthWest) => Some(Point::new(min, max)),
|
||||||
Ok(Direction::NorthEast) => Some(Point::new(self.width + margin, self.height + margin)),
|
Ok(Direction::NorthEast) => Some(Point::new(max, max)),
|
||||||
Ok(Direction::SouthWest) => Some(Point::new(-margin, -margin)),
|
Ok(Direction::SouthWest) => Some(Point::new(min, min)),
|
||||||
Ok(Direction::SouthEast) => Some(Point::new(self.width + margin, -margin)),
|
Ok(Direction::SouthEast) => Some(Point::new(max, min)),
|
||||||
_ => None,
|
_ => None,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
(src, dst)
|
// now shuffle the dst points such that the unknown corner is in the
|
||||||
|
// NorthEast direction
|
||||||
|
let mut shuffle: [Option<Point>; 4] = [None; 4];
|
||||||
|
shuffle.copy_from_slice(&dst);
|
||||||
|
if let Some(uk_corner) = uk_direction {
|
||||||
|
let corner_index: usize = uk_corner.into();
|
||||||
|
if corner_index != 0 {
|
||||||
|
for _ in 0..corner_index {
|
||||||
|
shuffle[1..].copy_from_slice(&dst[..3]);
|
||||||
|
shuffle[0] = dst[3];
|
||||||
|
dst.copy_from_slice(&shuffle);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
(src, shuffle)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn qr_pixels(&self) -> usize { self.dst_pixels }
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Copy, Clone, Default, Debug)]
|
#[derive(Copy, Clone, Default, Debug)]
|
||||||
|
|
@ -569,10 +607,36 @@ impl TryFrom<usize> for Direction {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
impl Direction {
|
||||||
|
pub fn eight_way_iter() -> EightConnectedIter { EightConnectedIter { index: 0 } }
|
||||||
|
}
|
||||||
|
pub struct EightConnectedIter {
|
||||||
|
index: usize,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Iterator for EightConnectedIter {
|
||||||
|
type Item = Direction;
|
||||||
|
|
||||||
|
fn next(&mut self) -> Option<Self::Item> {
|
||||||
|
let direction = match self.index {
|
||||||
|
0 => Some(Direction::NorthWest),
|
||||||
|
1 => Some(Direction::NorthEast),
|
||||||
|
2 => Some(Direction::SouthWest),
|
||||||
|
3 => Some(Direction::SouthEast),
|
||||||
|
4 => Some(Direction::North),
|
||||||
|
5 => Some(Direction::West),
|
||||||
|
6 => Some(Direction::East),
|
||||||
|
7 => Some(Direction::South),
|
||||||
|
_ => None,
|
||||||
|
};
|
||||||
|
self.index += 1;
|
||||||
|
direction
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// (0, 0) is at the lower left corner
|
/// (0, 0) is at the lower left corner
|
||||||
pub struct ImageRoi<'a> {
|
pub struct ImageRoi<'a> {
|
||||||
data: &'a mut [u8],
|
pub data: &'a mut [u8],
|
||||||
pub width: usize,
|
pub width: usize,
|
||||||
pub height: usize,
|
pub height: usize,
|
||||||
thresh: u8,
|
thresh: u8,
|
||||||
|
|
@ -658,6 +722,22 @@ impl<'a> ImageRoi<'a> {
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn neighbor_luma(&self, point: Point) -> Option<u8> {
|
||||||
|
let x = point.x;
|
||||||
|
let y = point.y;
|
||||||
|
let mut accumulated_luma = 0;
|
||||||
|
let mut total_counted = 0;
|
||||||
|
if x >= 0 && x < self.width as isize && y >= 0 && y < self.height as isize {
|
||||||
|
for direction in Direction::eight_way_iter() {
|
||||||
|
total_counted += 1;
|
||||||
|
let d: Point = direction.into();
|
||||||
|
let p: Point = d + point;
|
||||||
|
accumulated_luma += self.data[(p.y * (self.width as isize) + p.x).max(0) as usize] as usize;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if total_counted > 0 { Some((accumulated_luma / total_counted) as u8) } else { None }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> Iterator for ImageRoi<'_> {
|
impl<'a> Iterator for ImageRoi<'_> {
|
||||||
|
|
@ -822,3 +902,33 @@ pub fn find_finders(candidates: &mut Vec<Point>, image: &[u8], thresh: u8, strid
|
||||||
}
|
}
|
||||||
if candidates.len() != 0 { candidate_width / candidates.len() } else { 0 }
|
if candidates.len() != 0 { candidate_width / candidates.len() } else { 0 }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const MODULES_BY_VERSION: [usize; 40] = [
|
||||||
|
21, 25, 29, 33, 37, 41, 45, 49, 53, 57, 61, 65, 69, 73, 77, 81, 85, 89, 93, 97, 101, 105, 109, 113, 117,
|
||||||
|
121, 125, 129, 133, 137, 141, 145, 149, 153, 157, 161, 165, 169, 173, 177,
|
||||||
|
];
|
||||||
|
const FP_SHIFT: usize = 1 << 16;
|
||||||
|
/// Returns tuple of (version, expected_modules)
|
||||||
|
pub fn guess_code_version(finder_width_pix: usize, qr_width_pix: usize) -> (usize, usize) {
|
||||||
|
let incoming_ratio = ((qr_width_pix * FP_SHIFT) / finder_width_pix) as isize;
|
||||||
|
let mut candidate_ratio = usize::MAX;
|
||||||
|
let mut candidate = 0;
|
||||||
|
let mut returned_modules = 0;
|
||||||
|
for (i, &modules) in MODULES_BY_VERSION.iter().enumerate() {
|
||||||
|
let version_ratio = ((modules * FP_SHIFT) / 7) as isize;
|
||||||
|
log::debug!(
|
||||||
|
"{}: version_ratio {} incoming_ratio {} diff {}",
|
||||||
|
i + 1,
|
||||||
|
version_ratio,
|
||||||
|
incoming_ratio,
|
||||||
|
version_ratio - incoming_ratio
|
||||||
|
);
|
||||||
|
let prev_candidate = candidate_ratio;
|
||||||
|
candidate_ratio = candidate_ratio.min((version_ratio - incoming_ratio).abs() as usize);
|
||||||
|
if prev_candidate != candidate_ratio {
|
||||||
|
candidate = i + 1;
|
||||||
|
returned_modules = modules;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
(candidate, returned_modules)
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue