Merge pull request #909 from jing-vision/master

Alexey

2018-05-26 65e430588d76adbcf435db6b2e3aec791de651d0

 src/classifier.c

@@ -21,6 +21,8 @@
#include "opencv2/videoio/videoio_c.h"
#endif
image get_image_from_stream(CvCapture *cap);
image get_image_from_stream_cpp(CvCapture *cap);
#include "http_stream.h"
#endif

float *get_regression_values(char **labels, int n)
@@ -596,7 +598,7 @@

void try_classifier(char *datacfg, char *cfgfile, char *weightfile, char *filename, int layer_num)
{
    network net = parse_network_cfg(cfgfile);
    network net = parse_network_cfg_custom(cfgfile, 1);
    if(weightfile){
        load_weights(&net, weightfile);
    }
@@ -677,7 +679,7 @@

void predict_classifier(char *datacfg, char *cfgfile, char *weightfile, char *filename, int top)
{
    network net = parse_network_cfg(cfgfile);
    network net = parse_network_cfg_custom(cfgfile, 1);
    if(weightfile){
        load_weights(&net, weightfile);
    }
@@ -860,11 +862,14 @@
    srand(2222222);
    CvCapture * cap;

    if(filename){
        cap = cvCaptureFromFile(filename);
    }else{
        cap = cvCaptureFromCAM(cam_index);
    }
   if (filename) {
      //cap = cvCaptureFromFile(filename);
      cap = get_capture_video_stream(filename);
   }
   else {
      //cap = cvCaptureFromCAM(cam_index);
      cap = get_capture_webcam(cam_index);
   }

    int top = option_find_int(options, "top", 1);

@@ -886,7 +891,8 @@
        struct timeval tval_before, tval_after, tval_result;
        gettimeofday(&tval_before, NULL);

        image in = get_image_from_stream(cap);
      //image in = get_image_from_stream(cap);
        image in = get_image_from_stream_cpp(cap);
        if(!in.data) break;
        image in_s = resize_image(in, net.w, net.h);

@@ -992,11 +998,14 @@
    srand(2222222);
    CvCapture * cap;

    if(filename){
        cap = cvCaptureFromFile(filename);
    }else{
        cap = cvCaptureFromCAM(cam_index);
    }
   if (filename) {
      //cap = cvCaptureFromFile(filename);
      cap = get_capture_video_stream(filename);
   }
   else {
      //cap = cvCaptureFromCAM(cam_index);
      cap = get_capture_webcam(cam_index);
   }

    int top = option_find_int(options, "top", 1);

@@ -1015,7 +1024,8 @@
        struct timeval tval_before, tval_after, tval_result;
        gettimeofday(&tval_before, NULL);

        image in = get_image_from_stream(cap);
      //image in = get_image_from_stream(cap);
        image in = get_image_from_stream_cpp(cap);
        image in_s = resize_image(in, net.w, net.h);
        show_image(in, "Threat Detection");

@@ -1059,7 +1069,7 @@
{
#ifdef OPENCV
    printf("Classifier Demo\n");
    network net = parse_network_cfg(cfgfile);
    network net = parse_network_cfg_custom(cfgfile, 1);
    if(weightfile){
        load_weights(&net, weightfile);
    }
@@ -1070,9 +1080,11 @@
    CvCapture * cap;

    if(filename){
        cap = cvCaptureFromFile(filename);
        //cap = cvCaptureFromFile(filename);
      cap = get_capture_video_stream(filename);
    }else{
        cap = cvCaptureFromCAM(cam_index);
        //cap = cvCaptureFromCAM(cam_index);
      cap = get_capture_webcam(cam_index);
    }

    int top = option_find_int(options, "top", 1);
@@ -1092,7 +1104,8 @@
        struct timeval tval_before, tval_after, tval_result;
        gettimeofday(&tval_before, NULL);

        image in = get_image_from_stream(cap);
      //image in = get_image_from_stream(cap);
        image in = get_image_from_stream_cpp(cap);
        image in_s = resize_image(in, net.w, net.h);
        show_image(in, "Classifier");