better demo

Joseph Redmon

2016-06-23 52a6c30748c0cc115e77e9301ac631dd5fd8954c

better demo

 Makefile

@@ -1,5 +1,5 @@
GPU=1
OPENCV=1
GPU=0
OPENCV=0
CUDNN=0
DEBUG=0


 src/coco.c

@@ -371,6 +371,7 @@
    }
    float thresh = find_float_arg(argc, argv, "-thresh", .2);
    int cam_index = find_int_arg(argc, argv, "-c", 0);
    int frame_skip = find_int_arg(argc, argv, "-s", 0);

    if(argc < 4){
        fprintf(stderr, "usage: %s %s [train/test/valid] [cfg] [weights (optional)]\n", argv[0], argv[1]);
@@ -384,5 +385,5 @@
    else if(0==strcmp(argv[2], "train")) train_coco(cfg, weights);
    else if(0==strcmp(argv[2], "valid")) validate_coco(cfg, weights);
    else if(0==strcmp(argv[2], "recall")) validate_coco_recall(cfg, weights);
    else if(0==strcmp(argv[2], "demo")) demo(cfg, weights, thresh, cam_index, filename, coco_classes, coco_labels, 80);
    else if(0==strcmp(argv[2], "demo")) demo(cfg, weights, thresh, cam_index, filename, coco_classes, coco_labels, 80, frame_skip);
}

 src/demo.c

@@ -15,9 +15,6 @@
#include "opencv2/imgproc/imgproc_c.h"
void convert_detections(float *predictions, int classes, int num, int square, int side, int w, int h, float thresh, float **probs, box *boxes, int only_objectness);

#define DELAY 0
static int delay = DELAY;

static char **demo_names;
static image *demo_labels;
static int demo_classes;
@@ -43,14 +40,9 @@
{
    in = get_image_from_stream(cap);
    if(!in.data){
        in = disp;
        if(delay == DELAY) error("Stream closed.");
    }else{
        if(disp.data){
            free_image(disp);
        error("Stream closed.");
        }
        in_s = resize_image(in, net.w, net.h);
    }
    return 0;
}

@@ -63,9 +55,7 @@
    float *prediction = network_predict(net, X);

    memcpy(predictions[demo_index], prediction, l.outputs*sizeof(float));
    if(delay == DELAY){
        mean_arrays(predictions, FRAMES, l.outputs, avg);
    }

    free_image(det_s);
    convert_detections(avg, l.classes, l.n, l.sqrt, l.side, 1, 1, demo_thresh, probs, boxes, 0);
@@ -80,11 +70,7 @@
    demo_index = (demo_index + 1)%FRAMES;

    draw_detections(det, l.side*l.side*l.n, demo_thresh, boxes, probs, demo_names, demo_labels, demo_classes);
    if(delay == 0){
        delay = DELAY;
    } else {
        --delay;
    }

    return 0;
}

@@ -97,8 +83,10 @@
    return (double)time.tv_sec + (double)time.tv_usec * .000001;
}

void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, image *labels, int classes)
void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, image *labels, int classes, int frame_skip)
{
    //skip = frame_skip;
    int delay = frame_skip;
    demo_names = names;
    demo_labels = labels;
    demo_classes = classes;
@@ -161,27 +149,44 @@

    while(1){
        ++count;
        if(1){
        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");
        //fetch_in_thread(0);
        //detect_in_thread(0);

        show_image(disp, "Demo");
        cvWaitKey(1);
        //char buff[256];
        //sprintf(buff, "coco/coco_%05d", count);
        //save_image(disp, buff);
            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;
            }

        //free_image(disp);
        //cvWaitKey(10);
        pthread_join(fetch_thread, 0);
        pthread_join(detect_thread, 0);

            if(delay == 0){
                free_image(disp);
        disp  = det;
            }
        det   = in;
        det_s = in_s;
        }else {
            fetch_in_thread(0);
            det   = in;
            det_s = in_s;
            detect_in_thread(0);
            if(delay == 0) {
                free_image(disp);
                disp = det;
            }
            show_image(disp, "Demo");
            cvWaitKey(1);
        }
        --delay;
        if(delay < 0){
            delay = frame_skip;

        if(delay == DELAY){
            double after = get_wall_time();
            float curr = 1./(after - before);
            fps = curr;
@@ -190,7 +195,7 @@
    }
}
#else
void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, image *labels, int classes)
void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, image *labels, int classes, int frame_skip)
{
    fprintf(stderr, "Demo needs OpenCV for webcam images.\n");
}

 src/demo.h

@@ -2,6 +2,6 @@
#define DEMO

#include "image.h"
void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, image *labels, int classes);
void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, image *labels, int classes, int frame_skip);

#endif

 src/yolo.c

@@ -372,6 +372,7 @@

    float thresh = find_float_arg(argc, argv, "-thresh", .2);
    int cam_index = find_int_arg(argc, argv, "-c", 0);
    int frame_skip = find_int_arg(argc, argv, "-s", 0);
    if(argc < 4){
        fprintf(stderr, "usage: %s %s [train/test/valid] [cfg] [weights (optional)]\n", argv[0], argv[1]);
        return;
@@ -384,5 +385,5 @@
    else if(0==strcmp(argv[2], "train")) train_yolo(cfg, weights);
    else if(0==strcmp(argv[2], "valid")) validate_yolo(cfg, weights);
    else if(0==strcmp(argv[2], "recall")) validate_yolo_recall(cfg, weights);
    else if(0==strcmp(argv[2], "demo")) demo(cfg, weights, thresh, cam_index, filename, voc_names, voc_labels, 20);
    else if(0==strcmp(argv[2], "demo")) demo(cfg, weights, thresh, cam_index, filename, voc_names, voc_labels, 20, frame_skip);
}