From a720bf74e233c956e5281871ede722a2c7cf54db Mon Sep 17 00:00:00 2001 From: AlexeyAB Date: Tue, 22 May 2018 00:15:04 +0300 Subject: [PATCH] Added flag -ext_output for detector demo. Fixed proportional resize of network for random=1 --- src/demo.c | 10 ++++++---- src/detector.c | 14 ++++++++++---- src/image.c | 35 ++++++++++++++++++++++------------- 3 files changed, 38 insertions(+), 21 deletions(-) diff --git a/src/demo.c b/src/demo.c index 2d38269a..3452706a 100644 --- a/src/demo.c +++ b/src/demo.c @@ -40,6 +40,7 @@ static CvCapture * cap; static int cpp_video_capture = 0; static float fps = 0; static float demo_thresh = 0; +static int demo_ext_output = 0; static float *predictions[FRAMES]; static int demo_index = 0; @@ -48,7 +49,7 @@ 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 draw_detections_cv_v3(IplImage* show_img, detection *dets, int num, float thresh, char **names, image **alphabet, int classes); +void draw_detections_cv_v3(IplImage* show_img, detection *dets, int num, float thresh, char **names, image **alphabet, int classes, int ext_output); 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, int cpp_video_capture); IplImage* in_img; @@ -114,7 +115,7 @@ void *detect_in_thread(void *ptr) 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_v3(det_img, dets, nboxes, demo_thresh, demo_names, demo_alphabet, demo_classes); + draw_detections_cv_v3(det_img, dets, nboxes, demo_thresh, demo_names, demo_alphabet, demo_classes, demo_ext_output); //draw_detections_cv(det_img, l.w*l.h*l.n, demo_thresh, boxes, probs, demo_names, demo_alphabet, demo_classes); free_detections(dets, nboxes); @@ -131,7 +132,7 @@ double get_wall_time() } void demo(char *cfgfile, char *weightfile, float thresh, float hier_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) + int frame_skip, char *prefix, char *out_filename, int http_stream_port, int dont_show, int ext_output) { //skip = frame_skip; image **alphabet = load_alphabet(); @@ -140,6 +141,7 @@ void demo(char *cfgfile, char *weightfile, float thresh, float hier_thresh, int demo_alphabet = alphabet; demo_classes = classes; demo_thresh = thresh; + demo_ext_output = ext_output; printf("Demo\n"); net = parse_network_cfg_custom(cfgfile, 1); // set batch=1 if(weightfile){ @@ -313,7 +315,7 @@ void demo(char *cfgfile, char *weightfile, float thresh, float hier_thresh, int } #else void demo(char *cfgfile, char *weightfile, float thresh, float hier_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) + int frame_skip, char *prefix, char *out_filename, int http_stream_port, int dont_show, int ext_output) { fprintf(stderr, "Demo needs OpenCV for webcam images.\n"); } diff --git a/src/detector.c b/src/detector.c index f9cfdae5..6150df40 100644 --- a/src/detector.c +++ b/src/detector.c @@ -129,9 +129,15 @@ void train_detector(char *datacfg, char *cfgfile, char *weightfile, int *gpus, i //int dim = (rand() % 12 + (init_w/32 - 5)) * 32; // +-160 //int dim = (rand() % 4 + 16) * 32; //if (get_current_batch(net)+100 > net.max_batches) dim = 544; - int random_val = rand() % 12; - int dim_w = (random_val + (init_w / 32 - 5)) * 32; // +-160 - int dim_h = (random_val + (init_h / 32 - 5)) * 32; // +-160 + + //int random_val = rand() % 12; + //int dim_w = (random_val + (init_w / 32 - 5)) * 32; // +-160 + //int dim_h = (random_val + (init_h / 32 - 5)) * 32; // +-160 + + float random_val = rand_scale(1.4); // *x or /x + int dim_w = roundl(random_val*init_w / 32) * 32; + int dim_h = roundl(random_val*init_h / 32) * 32; + if (dim_w < 32) dim_w = 32; if (dim_h < 32) dim_h = 32; @@ -1218,7 +1224,7 @@ void run_detector(int argc, char **argv) if(strlen(filename) > 0) if (filename[strlen(filename) - 1] == 0x0d) filename[strlen(filename) - 1] = 0; demo(cfg, weights, thresh, hier_thresh, cam_index, filename, names, classes, frame_skip, prefix, out_filename, - http_stream_port, dont_show); + http_stream_port, dont_show, ext_output); } else printf(" There isn't such command: %s", argv[2]); } diff --git a/src/image.c b/src/image.c index a1e4c77e..fc4dc508 100644 --- a/src/image.c +++ b/src/image.c @@ -287,7 +287,7 @@ void draw_detections_v3(image im, detection *dets, int num, float thresh, char * const int best_class = selected_detections[i].best_class; printf("%s: %.0f%%", names[best_class], selected_detections[i].det.prob[best_class] * 100); if (ext_output) - printf("\t(left: %.0f \ttop: %.0f \tw: %0.f \th: %0.f)\n", + printf("\t(left: %4.0f top: %4.0f w: %4.0f h: %4.0f)\n", (selected_detections[i].det.bbox.x - selected_detections[i].det.bbox.w / 2)*im.w, (selected_detections[i].det.bbox.y - selected_detections[i].det.bbox.h / 2)*im.h, selected_detections[i].det.bbox.w*im.w, selected_detections[i].det.bbox.h*im.h); @@ -437,7 +437,7 @@ void draw_detections(image im, int num, float thresh, box *boxes, float **probs, #ifdef OPENCV -void draw_detections_cv_v3(IplImage* show_img, detection *dets, int num, float thresh, char **names, image **alphabet, int classes) +void draw_detections_cv_v3(IplImage* show_img, detection *dets, int num, float thresh, char **names, image **alphabet, int classes, int ext_output) { int i, j; if (!show_img) return; @@ -457,18 +457,16 @@ void draw_detections_cv_v3(IplImage* show_img, detection *dets, int num, float t strcat(labelstr, ", "); strcat(labelstr, names[j]); } - printf("%s: %.0f%%\n", names[j], dets[i].prob[j] * 100); + printf("%s: %.0f%% ", names[j], dets[i].prob[j] * 100); } } if (class_id >= 0) { int width = show_img->height * .006; - /* - if(0){ - width = pow(prob, 1./2.)*10+1; - alphabet = 0; - } - */ + //if(0){ + //width = pow(prob, 1./2.)*10+1; + //alphabet = 0; + //} //printf("%d %s: %.0f%%\n", i, names[class_id], prob*100); int offset = class_id * 123457 % classes; @@ -519,17 +517,28 @@ void draw_detections_cv_v3(IplImage* show_img, detection *dets, int num, float t color.val[2] = blue * 256; // you should create directory: result_img + //static int copied_frame_id = -1; + //static IplImage* copy_img = NULL; + //if (copied_frame_id != frame_id) { + // copied_frame_id = frame_id; + // if(copy_img == NULL) copy_img = cvCreateImage(cvSize(show_img->width, show_img->height), show_img->depth, show_img->nChannels); + // cvCopy(show_img, copy_img, 0); + //} //static int img_id = 0; //img_id++; //char image_name[1024]; //sprintf(image_name, "result_img/img_%d_%d_%d.jpg", frame_id, img_id, class_id); //CvRect rect = cvRect(pt1.x, pt1.y, pt2.x - pt1.x, pt2.y - pt1.y); - //cvSetImageROI(show_img, rect); - //cvSaveImage(image_name, show_img, 0); - //cvResetImageROI(show_img); + //cvSetImageROI(copy_img, rect); + //cvSaveImage(image_name, copy_img, 0); + //cvResetImageROI(copy_img); cvRectangle(show_img, pt1, pt2, color, width, 8, 0); - //printf("left=%d, right=%d, top=%d, bottom=%d, obj_id=%d, obj=%s \n", left, right, top, bot, class_id, names[class_id]); + if (ext_output) + printf(" (left: %4.0f top: %4.0f w: %4.0f h: %4.0f)\n", + (float)left, (float)right, b.w*show_img->width, b.h*show_img->height); + else + printf("\n"); cvRectangle(show_img, pt_text_bg1, pt_text_bg2, color, width, 8, 0); cvRectangle(show_img, pt_text_bg1, pt_text_bg2, color, CV_FILLED, 8, 0); // filled CvScalar black_color;