Return FR_NO_FILE if built-in cascade not found

This commit is contained in:
iabdalkader 2015-07-09 04:38:07 +02:00
parent 6c1d1ede81
commit 9d51051ba8
3 changed files with 28 additions and 18 deletions

View File

@ -292,6 +292,8 @@ error:
int imlib_load_cascade_from_flash(cascade_t *cascade, const char *path) int imlib_load_cascade_from_flash(cascade_t *cascade, const char *path)
{ {
FRESULT res=FR_OK;
if (strcmp(path, "frontalface") == 0) { if (strcmp(path, "frontalface") == 0) {
cascade->window.w = frontalface_window_w; cascade->window.w = frontalface_window_w;
cascade->window.h = frontalface_window_h; cascade->window.h = frontalface_window_h;
@ -316,8 +318,11 @@ int imlib_load_cascade_from_flash(cascade_t *cascade, const char *path)
cascade->num_rectangles_array= (int8_t *)eye_num_rectangles_array; cascade->num_rectangles_array= (int8_t *)eye_num_rectangles_array;
cascade->weights_array = (int8_t *)eye_weights_array; cascade->weights_array = (int8_t *)eye_weights_array;
cascade->rectangles_array = (int8_t *)eye_rectangles_array; cascade->rectangles_array = (int8_t *)eye_rectangles_array;
} else {
res = FR_NO_FILE;
} }
return 0;
return res;
} }
int imlib_load_cascade(cascade_t *cascade, const char *path) int imlib_load_cascade(cascade_t *cascade, const char *path)

View File

@ -1,24 +1,30 @@
import sensor, time import sensor, time
# Reset sensor
sensor.reset() sensor.reset()
# Set sensor brightness
# Sensor settings
sensor.set_contrast(1) sensor.set_contrast(1)
# Set sensor gainceiling
sensor.set_gainceiling(16) sensor.set_gainceiling(16)
# Set framesize sensor.set_framesize(sensor.QQVGA)
sensor.set_framesize(sensor.QCIF)
# Set sensor to grayscale
sensor.set_pixformat(sensor.GRAYSCALE) sensor.set_pixformat(sensor.GRAYSCALE)
# Load Haar Cascade # Load Haar Cascade
face_cascade = HaarCascade("/frontalface.cascade") face_cascade = HaarCascade("frontalface")
print(face_cascade) print(face_cascade)
# FPS clock
clock = time.clock() clock = time.clock()
while (True): while (True):
clock.tick() clock.tick()
# Capture snapshot
image = sensor.snapshot() image = sensor.snapshot()
objects = image.find_features(face_cascade, threshold=0.65, scale=1.65) # Find objects
objects = image.find_features(face_cascade, threshold=0.65, scale=1.85)
# Draw objects
for r in objects: for r in objects:
image.draw_rectangle(r) image.draw_rectangle(r)
#Add delay to see drawing on FB #Add delay to see drawing on FB
time.sleep(10) time.sleep(100)
print (clock.fps()) print (clock.fps())

View File

@ -1,18 +1,17 @@
import sensor, time import sensor, time
#sensor.reset() # Reset sensor
# Set framesize sensor.reset()
sensor.set_framesize(sensor.QQVGA)
# Set sensor to grayscale # Sensor settings
sensor.set_pixformat(sensor.GRAYSCALE)
# Set sensor contrast
sensor.set_contrast(1) sensor.set_contrast(1)
# Set sensor gainceiling
sensor.set_gainceiling(16) sensor.set_gainceiling(16)
sensor.set_framesize(sensor.QQVGA)
sensor.set_pixformat(sensor.GRAYSCALE)
def find_face(): def find_face():
global sensor, time global sensor, time
# Load Haar Cascade # Load Haar Cascade
face_cascade = HaarCascade("/frontalface.cascade") face_cascade = HaarCascade("frontalface")
while (True): while (True):
image = sensor.snapshot() image = sensor.snapshot()
objects = image.find_features(face_cascade, threshold=0.65, scale=1.85) objects = image.find_features(face_cascade, threshold=0.65, scale=1.85)