mirror/darknet
1
0
Fork 0
mirror of https://github.com/pjreddie/darknet.git synced 2023-08-10 21:13:14 +03:00
Code Issues Projects Releases Wiki Activity

Fixed VideoWriter

Browse Source
This commit is contained in:
AlexeyAB
2018-02-26 21:48:09 +03:00
parent e96a454ca1
commit 490d02505b
3 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/darknet/x64/rnn_tolstoy.cmd Normal file
View File

@ -0,0 +1,3 @@
darknet.exe rnn generate cfg/rnn.cfg tolstoy.weights -srand 2 -seed Chapter
pause

34
src/demo.c
View File

@ -49,18 +49,22 @@ 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, const char *out_filename, int http_stream_port);
void show_image_cv_ipl(IplImage *disp, const char *name, CvVideoWriter *output_video_writer, int http_stream_port);
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_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 = make_image(in.w, in.h, in.c);
@ -186,6 +190,23 @@ void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const ch
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){
@ -196,7 +217,7 @@ void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const ch
if(!prefix){
//show_image(disp, "Demo");
show_image_cv_ipl(show_img, "Demo", out_filename, http_stream_port);
show_image_cv_ipl(show_img, "Demo", output_video_writer, http_stream_port);
int c = cvWaitKey(1);
if (c == 10){
if(frame_skip == 0) frame_skip = 60;
@ -213,6 +234,8 @@ void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const ch
pthread_join(fetch_thread, 0);
pthread_join(detect_thread, 0);
if (flag_exit == 1) break;
if(delay == 0){
free_image(disp);
disp = det;
@ -244,6 +267,11 @@ void demo(char *cfgfile, char *weightfile, float thresh, int cam_index, const ch
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, char *out_filename, int http_stream_port)

26
src/image.c
View File

@ -528,7 +528,7 @@ void show_image_cv(image p, const char *name)
}
void show_image_cv_ipl(IplImage *disp, const char *name, const char *out_filename, int http_stream_port)
void show_image_cv_ipl(IplImage *disp, const char *name, CvVideoWriter *output_video_writer, int http_stream_port)
{
if (disp == NULL) return;
char buff[256];
@ -550,28 +550,8 @@ void show_image_cv_ipl(IplImage *disp, const char *name, const char *out_filenam
send_mjpeg(disp, port, timeout, jpeg_quality);
}
if(out_filename)
{
CvSize size;
{
size.width = disp->width, size.height = disp->height;
}
static CvVideoWriter* output_video = NULL; // cv::VideoWriter output_video;
if (output_video == NULL)
{
//const char* output_name = "test_dnn_out.avi";
//output_video = cvCreateVideoWriter(out_filename, CV_FOURCC('H', '2', '6', '4'), 25, size, 1);
output_video = cvCreateVideoWriter(out_filename, CV_FOURCC('D', 'I', 'V', 'X'), 25, size, 1);
//output_video = cvCreateVideoWriter(out_filename, CV_FOURCC('M', 'J', 'P', 'G'), 25, size, 1);
//output_video = cvCreateVideoWriter(out_filename, CV_FOURCC('M', 'P', '4', 'V'), 25, size, 1);
//output_video = cvCreateVideoWriter(out_filename, CV_FOURCC('M', 'P', '4', '2'), 25, size, 1);
//output_video = cvCreateVideoWriter(out_filename, CV_FOURCC('X', 'V', 'I', 'D'), 25, size, 1);
//output_video = cvCreateVideoWriter(out_filename, CV_FOURCC('W', 'M', 'V', '2'), 25, size, 1);
}
cvWriteFrame(output_video, disp); // comment this line to improve FPS !!!
if(output_video_writer) {
cvWriteFrame(output_video_writer, disp); // comment this line to improve FPS !!!
printf("\n cvWriteFrame \n");
}