Added include for sprintf

AlexeyAB

2018-03-12 15c89e7a714e7e37c13618eace9325a06f0642fc

 src/demo.c

@@ -7,13 +7,23 @@
#include "box.h"
#include "image.h"
#include "demo.h"
#ifdef WIN32
#include <time.h>
#include <winsock.h>
#include "gettimeofday.h"
#else
#include <sys/time.h>
#endif

#define FRAMES 3

#ifdef OPENCV
#include "opencv2/highgui/highgui_c.h"
#include "opencv2/imgproc/imgproc_c.h"
#include "opencv2/core/version.hpp"
#ifndef CV_VERSION_EPOCH
#include "opencv2/videoio/videoio_c.h"
#endif
image get_image_from_stream(CvCapture *cap);

static char **demo_names;
@@ -35,15 +45,31 @@
static float *predictions[FRAMES];
static int demo_index = 0;
static image images[FRAMES];
static IplImage* ipl_images[FRAMES];
static float *avg;

void draw_detections_cv(IplImage* show_img, int num, float thresh, box *boxes, float **probs, char **names, image **alphabet, int classes);
void show_image_cv_ipl(IplImage *disp, const char *name);
image get_image_from_stream_resize(CvCapture *cap, int w, int h, IplImage** in_img);
IplImage* in_img;
IplImage* det_img;
IplImage* show_img;

static int flag_exit;

void *fetch_in_thread(void *ptr)
{
    in = get_image_from_stream(cap);
    //in = get_image_from_stream(cap);
   in = get_image_from_stream_resize(cap, net.w, net.h, &in_img);
    if(!in.data){
        error("Stream closed.");
        //error("Stream closed.");
      flag_exit = 1;
      return;
    }
    in_s = resize_image(in, net.w, net.h);
    //in_s = resize_image(in, net.w, net.h);
   in_s = make_image(in.w, in.h, in.c);
   memcpy(in_s.data, in.data, in.h*in.w*in.c*sizeof(float));
	
    return 0;
}

@@ -75,11 +101,14 @@

    images[demo_index] = det;
    det = images[(demo_index + FRAMES/2 + 1)%FRAMES];
   ipl_images[demo_index] = det_img;
   det_img = ipl_images[(demo_index + FRAMES / 2 + 1) % FRAMES];
    demo_index = (demo_index + 1)%FRAMES;
	    
   //draw_detections(det, l.w*l.h*l.n, demo_thresh, boxes, probs, demo_names, demo_alphabet, demo_classes);
   draw_detections_cv(det_img, l.w*l.h*l.n, demo_thresh, boxes, probs, demo_names, demo_alphabet, demo_classes);

    draw_detections(det, l.w*l.h*l.n, demo_thresh, boxes, probs, demo_names, demo_alphabet, demo_classes);

    return 0;
   return 0;
}

double get_wall_time()
@@ -91,7 +120,8 @@
    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, int classes, int frame_skip, char *prefix)
void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, int classes, 
   int frame_skip, char *prefix, char *out_filename, int http_stream_port, int dont_show)
{
    //skip = frame_skip;
    image **alphabet = load_alphabet();
@@ -101,7 +131,7 @@
    demo_classes = classes;
    demo_thresh = thresh;
    printf("Demo\n");
    net = parse_network_cfg(cfgfile);
    net = parse_network_cfg_custom(cfgfile, 1);
    if(weightfile){
        load_weights(&net, weightfile);
    }
@@ -133,12 +163,14 @@
    pthread_t detect_thread;

    fetch_in_thread(0);
   det_img = in_img;
    det = in;
    det_s = in_s;

    fetch_in_thread(0);
    detect_in_thread(0);
    disp = det;
   det_img = in_img;
    det = in;
    det_s = in_s;

@@ -146,17 +178,35 @@
        fetch_in_thread(0);
        detect_in_thread(0);
        disp = det;
      det_img = in_img;
        det = in;
        det_s = in_s;
    }

    int count = 0;
    if(!prefix){
    if(!prefix && !dont_show){
        cvNamedWindow("Demo", CV_WINDOW_NORMAL); 
        cvMoveWindow("Demo", 0, 0);
        cvResizeWindow("Demo", 1352, 1013);
    }

   CvVideoWriter* output_video_writer = NULL;    // cv::VideoWriter output_video;
   if (out_filename)
   {
      CvSize size;
      size.width = det_img->width, size.height = det_img->height;

      //const char* output_name = "test_dnn_out.avi";
      //output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('H', '2', '6', '4'), 25, size, 1);
      output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('D', 'I', 'V', 'X'), 25, size, 1);
      //output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('M', 'J', 'P', 'G'), 25, size, 1);
      //output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('M', 'P', '4', 'V'), 25, size, 1);
      //output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('M', 'P', '4', '2'), 25, size, 1);
      //output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('X', 'V', 'I', 'D'), 25, size, 1);
      //output_video_writer = cvCreateVideoWriter(out_filename, CV_FOURCC('W', 'M', 'V', '2'), 25, size, 1);
   }
   flag_exit = 0;

    double before = get_wall_time();

    while(1){
@@ -166,31 +216,55 @@
            if(pthread_create(&detect_thread, 0, detect_in_thread, 0)) error("Thread creation failed");

            if(!prefix){
                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 (!dont_show) {
               show_image_cv_ipl(show_img, "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, "%s_%08d", prefix, count);
                save_image(disp, buff);
            }

         // if you run it with param -http_port 8090  then open URL in your web-browser: http://localhost:8090
         if (http_stream_port > 0 && show_img) {
            //int port = 8090;
            int port = http_stream_port;
            int timeout = 200;
            int jpeg_quality = 30;  // 1 - 100
            send_mjpeg(show_img, port, timeout, jpeg_quality);
         }

         // save video file
         if (output_video_writer && show_img) {
            cvWriteFrame(output_video_writer, show_img);
            printf("\n cvWriteFrame \n");
         }

         cvReleaseImage(&show_img);

            pthread_join(fetch_thread, 0);
            pthread_join(detect_thread, 0);

         if (flag_exit == 1) break;

            if(delay == 0){
                free_image(disp);
                disp  = det;
            show_img = det_img;
            }
         det_img = in_img;
            det   = in;
            det_s = in_s;
        }else {
            fetch_in_thread(0);
         det_img = in_img;
            det   = in;
            det_s = in_s;
            detect_in_thread(0);
@@ -198,8 +272,10 @@
                free_image(disp);
                disp = det;
            }
            show_image(disp, "Demo");
            cvWaitKey(1);
         if (!dont_show) {
            show_image(disp, "Demo");
            cvWaitKey(1);
         }
        }
        --delay;
        if(delay < 0){
@@ -211,9 +287,14 @@
            before = after;
        }
    }
   printf("input video stream closed. \n");
   if (output_video_writer) {
      cvReleaseVideoWriter(&output_video_writer);
      printf("output_video_writer closed. \n");
   }
}
#else
void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, int classes, int frame_skip, char *prefix)
void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const char *filename, char **names, int classes, int frame_skip, char *prefix, char *out_filename, int http_stream_port, int dont_show)
{
    fprintf(stderr, "Demo needs OpenCV for webcam images.\n");
}