Merge branch 'master' of https://github.com/pjreddie/darknet

Joseph Redmon

2016-06-23 d7fd2acf0582020de87f49d8863d39d1744a858c

 src/demo.c

@@ -8,14 +8,14 @@
#include "demo.h"
#include <sys/time.h>

#define FRAMES 1
#define FRAMES 3

#ifdef OPENCV
#include "opencv2/highgui/highgui_c.h"
#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 5
#define DELAY 0
static int delay = DELAY;

static char **demo_names;
@@ -72,7 +72,7 @@
    if (nms > 0) do_nms(boxes, probs, l.side*l.side*l.n, l.classes, nms);
    printf("\033[2J");
    printf("\033[1;1H");
    printf("\nFPS:%.0f\n",fps);
    printf("\nFPS:%.1f\n",fps);
    printf("Objects:\n\n");

    images[demo_index] = det;
@@ -88,6 +88,15 @@
    return 0;
}

double get_wall_time()
{
    struct timeval time;
    if (gettimeofday(&time,NULL)){
        return 0;
    }
    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)
{
    demo_names = names;
@@ -110,8 +119,6 @@
    }

    if(!cap) error("Couldn't connect to webcam.\n");
    //cvNamedWindow("COCO", CV_WINDOW_NORMAL); 
    //cvResizeWindow("COCO", 512, 512);

    detection_layer l = net.layers[net.n-1];
    int j;
@@ -124,8 +131,8 @@
    probs = (float **)calloc(l.side*l.side*l.n, sizeof(float *));
    for(j = 0; j < l.side*l.side*l.n; ++j) probs[j] = (float *)calloc(l.classes, sizeof(float *));

//    pthread_t fetch_thread;
 //   pthread_t detect_thread;
    pthread_t fetch_thread;
    pthread_t detect_thread;

    fetch_in_thread(0);
    det = in;
@@ -146,33 +153,40 @@
    }

    int count = 0;
    cvNamedWindow("Demo", CV_WINDOW_NORMAL); 
    cvMoveWindow("Demo", 0, 0);
    cvResizeWindow("Demo", 1352, 1013);

    double before = get_wall_time();

    while(1){
        ++count;
        struct timeval tval_before, tval_after, tval_result;
        gettimeofday(&tval_before, NULL);
        //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);
        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);

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

        disp  = det;
        det   = in;
        det_s = in_s;

        //show_image(disp, "COCO");
        char buff[256];
        sprintf(buff, "coco/coco_%05d", count);
        save_image(disp, buff);

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

        gettimeofday(&tval_after, NULL);
        timersub(&tval_after, &tval_before, &tval_result);
        float curr = 1000000.f/((long int)tval_result.tv_usec);
        fps = .9*fps + .1*curr;
        if(delay == DELAY){
            double after = get_wall_time();
            float curr = 1./(after - before);
            fps = curr;
            before = after;
        }
    }
}
#else