mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-21 09:14:34 +00:00
integrate gc2145 into userspace
couple of notes: - bw threshold is now dynamic, based on the average of the previous frame - performance is a bit slower than ideal, because of the SPI back pressure bug preventing us from reading out the video at full speed. This should be better on NTO. - rotation introduced so that the preview image should align up with what we'll have in the final camera v. display orientation in the baosec product - tested against the TOTP test suite (edent.codeberg.page/TOTP_Test_Suite/) and it can quickly capture all of the basic valid tests.
This commit is contained in:
parent
7ee15b874d
commit
2699146d62
2 changed files with 25 additions and 20 deletions
|
|
@ -64,7 +64,6 @@ use xous_ipc::Buffer;
|
||||||
|
|
||||||
pub const IMAGE_WIDTH: usize = 256;
|
pub const IMAGE_WIDTH: usize = 256;
|
||||||
pub const IMAGE_HEIGHT: usize = 240;
|
pub const IMAGE_HEIGHT: usize = 240;
|
||||||
pub const BW_THRESH: u8 = 128;
|
|
||||||
|
|
||||||
// Next steps for performance improvement:
|
// Next steps for performance improvement:
|
||||||
//
|
//
|
||||||
|
|
@ -77,25 +76,29 @@ pub const BW_THRESH: u8 = 128;
|
||||||
|
|
||||||
/// This converts a frame of `[u8]` grayscale pixels that may be larger than the native
|
/// This converts a frame of `[u8]` grayscale pixels that may be larger than the native
|
||||||
/// frame buffer resolution into a black and white bitmap.
|
/// frame buffer resolution into a black and white bitmap.
|
||||||
pub fn blit_to_display(display: &mut Oled128x128, frame: &[u8], display_cleared: bool) {
|
pub fn blit_to_display(display: &mut Oled128x128, frame: &[u8], display_cleared: bool, bw_thresh: &mut u8) {
|
||||||
|
let mut sum: u32 = 0;
|
||||||
|
let mut count: u32 = 0;
|
||||||
for (y, row) in frame.chunks(IMAGE_WIDTH).enumerate() {
|
for (y, row) in frame.chunks(IMAGE_WIDTH).enumerate() {
|
||||||
if y & 1 == 0 {
|
if y & 1 == 0 {
|
||||||
// skip every other line
|
// skip every other line
|
||||||
for (x, &pixval) in row.iter().enumerate() {
|
for (x, &pixval) in row.iter().enumerate() {
|
||||||
if x & 1 == 0 {
|
if x & 1 == 0 {
|
||||||
// skip every other pixel
|
// skip every other pixel
|
||||||
if x < display.dimensions().x as usize * 2
|
if y < display.dimensions().x as usize * 2
|
||||||
&& y < display.dimensions().y as usize * 2 - (gfx::CHAR_HEIGHT as usize + 1) * 2
|
&& x < display.dimensions().y as usize * 2 - (gfx::CHAR_HEIGHT as usize + 1) * 2
|
||||||
{
|
{
|
||||||
let luminance = pixval & 0xff;
|
let luminance = pixval & 0xff;
|
||||||
if luminance > BW_THRESH {
|
sum += luminance as u32;
|
||||||
display.put_pixel(Point::new(x as isize / 2, y as isize / 2), Mono::White.into());
|
count += 1;
|
||||||
|
if luminance > *bw_thresh {
|
||||||
|
display.put_pixel(Point::new(y as isize / 2, x as isize / 2), Mono::White.into());
|
||||||
} else {
|
} else {
|
||||||
// optimization to avoid some computation if we're blitting to an already-black
|
// optimization to avoid some computation if we're blitting to an already-black
|
||||||
// buffer
|
// buffer
|
||||||
if !display_cleared {
|
if !display_cleared {
|
||||||
display.put_pixel(
|
display.put_pixel(
|
||||||
Point::new(x as isize / 2, y as isize / 2),
|
Point::new(y as isize / 2, x as isize / 2),
|
||||||
Mono::Black.into(),
|
Mono::Black.into(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
@ -107,6 +110,7 @@ pub fn blit_to_display(display: &mut Oled128x128, frame: &[u8], display_cleared:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*bw_thresh = (sum / count) as u8;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[repr(align(32))]
|
#[repr(align(32))]
|
||||||
|
|
@ -310,6 +314,7 @@ pub fn wrapped_main(main_thread_token: MainThreadToken) -> ! {
|
||||||
let mut msg_opt = None;
|
let mut msg_opt = None;
|
||||||
#[cfg(feature = "gfx-testing")]
|
#[cfg(feature = "gfx-testing")]
|
||||||
testing::tests();
|
testing::tests();
|
||||||
|
let mut bw_thresh: u8 = 128;
|
||||||
loop {
|
loop {
|
||||||
if !is_panic.load(Ordering::Relaxed) {
|
if !is_panic.load(Ordering::Relaxed) {
|
||||||
xous::reply_and_receive_next(sid, &mut msg_opt).unwrap();
|
xous::reply_and_receive_next(sid, &mut msg_opt).unwrap();
|
||||||
|
|
@ -337,9 +342,9 @@ pub fn wrapped_main(main_thread_token: MainThreadToken) -> ! {
|
||||||
for (y_src, line) in fb.chunks(IMAGE_WIDTH / 2).enumerate() {
|
for (y_src, line) in fb.chunks(IMAGE_WIDTH / 2).enumerate() {
|
||||||
for (x_src, &u32src) in line.iter().enumerate() {
|
for (x_src, &u32src) in line.iter().enumerate() {
|
||||||
frame[(IMAGE_HEIGHT - y_src - 1) * IMAGE_WIDTH + 2 * x_src] =
|
frame[(IMAGE_HEIGHT - y_src - 1) * IMAGE_WIDTH + 2 * x_src] =
|
||||||
(u32src & 0xff) as u8;
|
((u32src >> 8) & 0xff) as u8;
|
||||||
frame[(IMAGE_HEIGHT - y_src - 1) * IMAGE_WIDTH + 2 * x_src + 1] =
|
frame[(IMAGE_HEIGHT - y_src - 1) * IMAGE_WIDTH + 2 * x_src + 1] =
|
||||||
((u32src >> 16) & 0xff) as u8;
|
((u32src >> 24) & 0xff) as u8;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
frames += 1;
|
frames += 1;
|
||||||
|
|
@ -348,7 +353,7 @@ pub fn wrapped_main(main_thread_token: MainThreadToken) -> ! {
|
||||||
decode_success = false;
|
decode_success = false;
|
||||||
log::info!("------------- SEARCH {} -----------", frames);
|
log::info!("------------- SEARCH {} -----------", frames);
|
||||||
let finder_width =
|
let finder_width =
|
||||||
qr::find_finders(&mut candidates, &frame, BW_THRESH, IMAGE_WIDTH) as isize;
|
qr::find_finders(&mut candidates, &frame, bw_thresh, IMAGE_WIDTH) as isize;
|
||||||
if candidates.len() == 3 {
|
if candidates.len() == 3 {
|
||||||
let candidates_orig = candidates.clone();
|
let candidates_orig = candidates.clone();
|
||||||
let mut x_candidates: [Point; 3] = [Point::new(0, 0); 3];
|
let mut x_candidates: [Point; 3] = [Point::new(0, 0); 3];
|
||||||
|
|
@ -363,7 +368,7 @@ pub fn wrapped_main(main_thread_token: MainThreadToken) -> ! {
|
||||||
as usize,
|
as usize,
|
||||||
) {
|
) {
|
||||||
let dims = Point::new(IMAGE_WIDTH as isize, IMAGE_HEIGHT as isize);
|
let dims = Point::new(IMAGE_WIDTH as isize, IMAGE_HEIGHT as isize);
|
||||||
let mut il = qr::ImageRoi::new(&mut frame, dims, BW_THRESH);
|
let mut il = qr::ImageRoi::new(&mut frame, dims, bw_thresh);
|
||||||
let (src, dst) = qr_corners.mapping(&mut il, qr::HOMOGRAPHY_MARGIN);
|
let (src, dst) = qr_corners.mapping(&mut il, qr::HOMOGRAPHY_MARGIN);
|
||||||
let mut src_f: [(f32, f32); 4] = [(0.0, 0.0); 4];
|
let mut src_f: [(f32, f32); 4] = [(0.0, 0.0); 4];
|
||||||
let mut dst_f: [(f32, f32); 4] = [(0.0, 0.0); 4];
|
let mut dst_f: [(f32, f32); 4] = [(0.0, 0.0); 4];
|
||||||
|
|
@ -448,7 +453,7 @@ pub fn wrapped_main(main_thread_token: MainThreadToken) -> ! {
|
||||||
*dst = src;
|
*dst = src;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
blit_to_display(&mut display, &frame, true);
|
blit_to_display(&mut display, &frame, true, &mut bw_thresh);
|
||||||
|
|
||||||
// we now have a QR code in "canonical" orientation, with a
|
// we now have a QR code in "canonical" orientation, with a
|
||||||
// known width in pixels
|
// known width in pixels
|
||||||
|
|
@ -459,7 +464,7 @@ pub fn wrapped_main(main_thread_token: MainThreadToken) -> ! {
|
||||||
// Confirm that the finders coordinates are valid
|
// Confirm that the finders coordinates are valid
|
||||||
let mut checked_candidates = Vec::<Point>::new();
|
let mut checked_candidates = Vec::<Point>::new();
|
||||||
let x_finder_width =
|
let x_finder_width =
|
||||||
qr::find_finders(&mut checked_candidates, &aligned, BW_THRESH, qr_width as _)
|
qr::find_finders(&mut checked_candidates, &aligned, bw_thresh, qr_width as _)
|
||||||
as isize;
|
as isize;
|
||||||
log::info!("x_finder width: {}", x_finder_width);
|
log::info!("x_finder width: {}", x_finder_width);
|
||||||
|
|
||||||
|
|
@ -492,13 +497,14 @@ pub fn wrapped_main(main_thread_token: MainThreadToken) -> ! {
|
||||||
let qr = qr::ImageRoi::new(
|
let qr = qr::ImageRoi::new(
|
||||||
&mut aligned,
|
&mut aligned,
|
||||||
Point::new(qr_width as _, qr_width as _),
|
Point::new(qr_width as _, qr_width as _),
|
||||||
BW_THRESH,
|
bw_thresh,
|
||||||
);
|
);
|
||||||
let grid = modules::stream_to_grid(
|
let grid = modules::stream_to_grid(
|
||||||
&qr,
|
&qr,
|
||||||
qr_width,
|
qr_width,
|
||||||
modules,
|
modules,
|
||||||
qr::HOMOGRAPHY_MARGIN.abs() as usize,
|
qr::HOMOGRAPHY_MARGIN.abs() as usize,
|
||||||
|
bw_thresh,
|
||||||
);
|
);
|
||||||
|
|
||||||
println!("grid len {}", grid.len());
|
println!("grid len {}", grid.len());
|
||||||
|
|
@ -558,7 +564,7 @@ pub fn wrapped_main(main_thread_token: MainThreadToken) -> ! {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
blit_to_display(&mut display, &frame, true);
|
blit_to_display(&mut display, &frame, true, &mut bw_thresh);
|
||||||
for c in candidates_orig.iter() {
|
for c in candidates_orig.iter() {
|
||||||
log::debug!("****** candidate: {}, {} ******", c.x, c.y);
|
log::debug!("****** candidate: {}, {} ******", c.x, c.y);
|
||||||
// remap image to screen coordinates (it's 2:1)
|
// remap image to screen coordinates (it's 2:1)
|
||||||
|
|
@ -577,7 +583,7 @@ pub fn wrapped_main(main_thread_token: MainThreadToken) -> ! {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// blit raw camera fb to display
|
// blit raw camera fb to display
|
||||||
blit_to_display(&mut display, &frame, true);
|
blit_to_display(&mut display, &frame, true, &mut bw_thresh);
|
||||||
gfx::msg(
|
gfx::msg(
|
||||||
&mut display,
|
&mut display,
|
||||||
"Scan QR code...",
|
"Scan QR code...",
|
||||||
|
|
|
||||||
|
|
@ -107,6 +107,7 @@ pub fn stream_to_grid(
|
||||||
qr_size_pixels: usize,
|
qr_size_pixels: usize,
|
||||||
qr_size_modules: usize,
|
qr_size_modules: usize,
|
||||||
margin: usize,
|
margin: usize,
|
||||||
|
bw_thresh: u8,
|
||||||
) -> Vec<bool> {
|
) -> Vec<bool> {
|
||||||
let pix_per_module = ((qr_size_pixels - margin * 2) << FIXED_POINT_SHIFT) / qr_size_modules;
|
let pix_per_module = ((qr_size_pixels - margin * 2) << FIXED_POINT_SHIFT) / qr_size_modules;
|
||||||
let mut x_frac = FracIter::new(
|
let mut x_frac = FracIter::new(
|
||||||
|
|
@ -128,9 +129,7 @@ pub fn stream_to_grid(
|
||||||
while let Some(x) = x_frac.next() {
|
while let Some(x) = x_frac.next() {
|
||||||
if true {
|
if true {
|
||||||
// seems to work better with the simple threshold?
|
// seems to work better with the simple threshold?
|
||||||
if image.data[(y + margin - FUDGE_Y) * image.width + (x + margin + FUDGE_X)]
|
if image.data[(y + margin - FUDGE_Y) * image.width + (x + margin + FUDGE_X)] < bw_thresh {
|
||||||
< crate::BW_THRESH
|
|
||||||
{
|
|
||||||
grid.push(true);
|
grid.push(true);
|
||||||
} else {
|
} else {
|
||||||
grid.push(false);
|
grid.push(false);
|
||||||
|
|
@ -139,7 +138,7 @@ pub fn stream_to_grid(
|
||||||
if image
|
if image
|
||||||
.neighbor_luma(Point::new(x as isize + margin as isize, y as isize + margin as isize))
|
.neighbor_luma(Point::new(x as isize + margin as isize, y as isize + margin as isize))
|
||||||
.unwrap()
|
.unwrap()
|
||||||
< crate::BW_THRESH
|
< bw_thresh
|
||||||
{
|
{
|
||||||
grid.push(true);
|
grid.push(true);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue