ash/Anemone3DS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various improvements to QR scanner

Browse Source 
* Improve QR scanner initialization time
* Fix race condition with QR scanner and button spamming
* Don't show black screen before QR scanner has loaded
* Show loading message for QR scanner
This commit is contained in:
Alex Taber
2018-07-26 22:02:54 +03:00
parent 09de17729b
commit d3e1b746cd
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/camera.h
View File

@@ -37,6 +37,7 @@ typedef struct {
volatile bool finished; volatile bool finished;
volatile bool success; volatile bool success;
Handle cancel; Handle cancel;
Handle started;
bool capturing; bool capturing;
struct quirc* context; struct quirc* context;

5
source/camera.c
View File

@@ -58,7 +58,6 @@ void capture_cam_thread(void *arg)
u32 transferUnit; u32 transferUnit;
u16 *buffer = calloc(1, 400 * 240 * sizeof(u16)); u16 *buffer = calloc(1, 400 * 240 * sizeof(u16));
camInit();
CAMU_SetSize(SELECT_OUT1, SIZE_CTR_TOP_LCD, CONTEXT_A); CAMU_SetSize(SELECT_OUT1, SIZE_CTR_TOP_LCD, CONTEXT_A);
CAMU_SetOutputFormat(SELECT_OUT1, OUTPUT_RGB_565, CONTEXT_A); CAMU_SetOutputFormat(SELECT_OUT1, OUTPUT_RGB_565, CONTEXT_A);
CAMU_SetFrameRate(SELECT_OUT1, FRAME_RATE_30); CAMU_SetFrameRate(SELECT_OUT1, FRAME_RATE_30);
@@ -73,6 +72,7 @@ void capture_cam_thread(void *arg)
CAMU_ClearBuffer(PORT_CAM1); CAMU_ClearBuffer(PORT_CAM1);
CAMU_SetReceiving(&events[1], buffer, PORT_CAM1, 400 * 240 * sizeof(u16), (s16) transferUnit); CAMU_SetReceiving(&events[1], buffer, PORT_CAM1, 400 * 240 * sizeof(u16), (s16) transferUnit);
CAMU_StartCapture(PORT_CAM1); CAMU_StartCapture(PORT_CAM1);
svcSignalEvent(data->started);
bool cancel = false; bool cancel = false;
while (!cancel) while (!cancel)
{ {
@@ -128,6 +128,7 @@ void capture_cam_thread(void *arg)
void update_ui(void *arg) void update_ui(void *arg)
{ {
qr_data* data = (qr_data*) arg; qr_data* data = (qr_data*) arg;
while (!data->finished) while (!data->finished)
{ {
draw_base_interface(); draw_base_interface();
@@ -166,6 +167,7 @@ bool start_capture_cam(qr_data *data)
svcCreateMutex(&data->mutex, false); svcCreateMutex(&data->mutex, false);
if(threadCreate(capture_cam_thread, data, 0x10000, 0x1A, 1, true) == NULL) if(threadCreate(capture_cam_thread, data, 0x10000, 0x1A, 1, true) == NULL)
return false; return false;
svcWaitSynchronization(data->started, U64_MAX);
if(threadCreate(update_ui, data, 0x10000, 0x1A, 1, true) == NULL) if(threadCreate(update_ui, data, 0x10000, 0x1A, 1, true) == NULL)
{ {
exit_qr(data); exit_qr(data);
@@ -303,6 +305,7 @@ bool init_qr(void)
qr_data *data = calloc(1, sizeof(qr_data)); qr_data *data = calloc(1, sizeof(qr_data));
data->capturing = false; data->capturing = false;
data->finished = false; data->finished = false;
svcCreateEvent(&data->started, RESET_STICKY);
data->context = quirc_new(); data->context = quirc_new();
quirc_resize(data->context, 400, 240); quirc_resize(data->context, 400, 240);

4
source/main.c
View File

@@ -449,9 +449,11 @@ int main(void)
else if(!qr_mode && !preview_mode && kDown & KEY_R) //toggle QR mode else if(!qr_mode && !preview_mode && kDown & KEY_R) //toggle QR mode
{ {
enable_qr: enable_qr:
draw_base_interface();
draw_text_center(GFX_TOP, 100, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE], "Loading QR Scanner...");
end_frame();
if(R_SUCCEEDED(camInit())) if(R_SUCCEEDED(camInit()))
{ {
camExit();
u32 out; u32 out;
ACU_GetWifiStatus(&out); ACU_GetWifiStatus(&out);
if(out) if(out)