From b8eb8b0a4016232c8da95c26501ac60ea9491901 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 02 Sep 2016 00:26:12 +0000
Subject: [PATCH] Merge branch 'master' of github.com:pjreddie/darknet
---
src/demo.c | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/demo.c b/src/demo.c
index 0b870cf..020513f 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -48,7 +48,7 @@
void *detect_in_thread(void *ptr)
{
- float nms = .4;
+ float nms = .1;
detection_layer l = net.layers[net.n-1];
float *X = det_s.data;
@@ -153,13 +153,19 @@
if(pthread_create(&fetch_thread, 0, fetch_in_thread, 0)) error("Thread creation failed");
if(pthread_create(&detect_thread, 0, detect_in_thread, 0)) error("Thread creation failed");
- show_image(disp, "Demo");
- int c = cvWaitKey(1);
- if (c == 10){
- if(frame_skip == 0) frame_skip = 60;
- else if(frame_skip == 4) frame_skip = 0;
- else if(frame_skip == 60) frame_skip = 4;
- else frame_skip = 0;
+ if(1){
+ show_image(disp, "Demo");
+ int c = cvWaitKey(1);
+ if (c == 10){
+ if(frame_skip == 0) frame_skip = 60;
+ else if(frame_skip == 4) frame_skip = 0;
+ else if(frame_skip == 60) frame_skip = 4;
+ else frame_skip = 0;
+ }
+ }else{
+ char buff[256];
+ sprintf(buff, "/home/pjreddie/tmp/bag_%07d", count);
+ save_image(disp, buff);
}
pthread_join(fetch_thread, 0);
--
Gitblit v1.10.0