Fixed saving video file

pull/492/head
AlexeyAB 7 years ago
parent 09fdb67d66
commit f0bc634a74
  1. 5
      src/demo.c
  2. 4
      src/image.c

@ -233,7 +233,7 @@ void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const ch
} }
// if you run it with param -http_port 8090 then open URL in your web-browser: http://localhost:8090 // if you run it with param -http_port 8090 then open URL in your web-browser: http://localhost:8090
if (http_stream_port > 0) { if (http_stream_port > 0 && show_img) {
//int port = 8090; //int port = 8090;
int port = http_stream_port; int port = http_stream_port;
int timeout = 200; int timeout = 200;
@ -242,10 +242,11 @@ void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const ch
} }
// save video file // save video file
if (output_video_writer) { if (output_video_writer && show_img) {
cvWriteFrame(output_video_writer, show_img); cvWriteFrame(output_video_writer, show_img);
printf("\n cvWriteFrame \n"); printf("\n cvWriteFrame \n");
} }
cvReleaseImage(&show_img); cvReleaseImage(&show_img);
pthread_join(fetch_thread, 0); pthread_join(fetch_thread, 0);

@ -318,11 +318,12 @@ IplImage* draw_train_chart(float max_img_loss, int max_batches, int number_of_li
IplImage* img = cvCreateImage(cvSize(img_size, img_size), 8, 3); IplImage* img = cvCreateImage(cvSize(img_size, img_size), 8, 3);
cvSet(img, CV_RGB(255, 255, 255), 0); cvSet(img, CV_RGB(255, 255, 255), 0);
CvPoint pt1, pt2, pt_text; CvPoint pt1, pt2, pt_text;
pt1.x = img_offset; pt2.x = img_size, pt_text.x = 10;
CvFont font; CvFont font;
cvInitFont(&font, CV_FONT_HERSHEY_COMPLEX_SMALL, 0.7, 0.7, 0, 1, CV_AA); cvInitFont(&font, CV_FONT_HERSHEY_COMPLEX_SMALL, 0.7, 0.7, 0, 1, CV_AA);
char char_buff[100]; char char_buff[100];
int i; int i;
// vertical lines
pt1.x = img_offset; pt2.x = img_size, pt_text.x = 10;
for (i = 1; i <= number_of_lines; ++i) { for (i = 1; i <= number_of_lines; ++i) {
pt1.y = pt2.y = (float)i * draw_size / number_of_lines; pt1.y = pt2.y = (float)i * draw_size / number_of_lines;
cvLine(img, pt1, pt2, CV_RGB(224, 224, 224), 1, 8, 0); cvLine(img, pt1, pt2, CV_RGB(224, 224, 224), 1, 8, 0);
@ -333,6 +334,7 @@ IplImage* draw_train_chart(float max_img_loss, int max_batches, int number_of_li
cvLine(img, pt1, pt2, CV_RGB(128, 128, 128), 1, 8, 0); cvLine(img, pt1, pt2, CV_RGB(128, 128, 128), 1, 8, 0);
} }
} }
// horizontal lines
pt1.y = draw_size; pt2.y = 0, pt_text.y = draw_size + 15; pt1.y = draw_size; pt2.y = 0, pt_text.y = draw_size + 15;
for (i = 0; i <= number_of_lines; ++i) { for (i = 0; i <= number_of_lines; ++i) {
pt1.x = pt2.x = img_offset + (float)i * draw_size / number_of_lines; pt1.x = pt2.x = img_offset + (float)i * draw_size / number_of_lines;

Loading…
Cancel
Save