mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2025-12-23 23:18:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revise variable names netcam_rtsp to netcam

Browse Source
This commit is contained in:
MrDave
2019-09-25 23:03:16 -06:00
committed by Mr-Dave
parent 851227b00b
commit b6038af62d
22 changed files with 740 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
po/da.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 4.x\n"
"Report-Msgid-Bugs-To: https://motion-project.github.io\n"
"POT-Creation-Date: 2019-09-25 22:32-0600\n"
"POT-Creation-Date: 2019-09-25 23:02-0600\n"
"PO-Revision-Date: 2018-10-13 11:59-0600\n"
"Last-Translator: MrDave <MotionMrDave@gmail.com>\n"
"Language-Team: MrDave <MotionMrDave@gmail.com>\n"
@@ -2600,7 +2600,7 @@ msgid "calling mmalcam_cleanup"
msgstr ""
#: src/video_common.c
msgid "calling netcam_rtsp_cleanup"
msgid "calling netcam_cleanup"
msgstr ""
#: src/video_common.c
@@ -2620,11 +2620,11 @@ msgid "MMAL cam failed to open"
msgstr ""
#: src/video_common.c
msgid "Opening Netcam RTSP"
msgid "Opening Netcam"
msgstr ""
#: src/video_common.c
msgid "Netcam RTSP failed to open"
msgid "Netcam failed to open"
msgstr ""
#: src/video_common.c

8
po/de.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 4.x\n"
"Report-Msgid-Bugs-To: https://motion-project.github.io\n"
"POT-Creation-Date: 2019-09-25 22:32-0600\n"
"POT-Creation-Date: 2019-09-25 23:02-0600\n"
"PO-Revision-Date: 2018-10-13 11:59-0600\n"
"Last-Translator: MrDave <MotionMrDave@gmail.com>\n"
"Language-Team: MrDave <MotionMrDave@gmail.com>\n"
@@ -2601,7 +2601,7 @@ msgid "calling mmalcam_cleanup"
msgstr ""
#: src/video_common.c
msgid "calling netcam_rtsp_cleanup"
msgid "calling netcam_cleanup"
msgstr ""
#: src/video_common.c
@@ -2621,11 +2621,11 @@ msgid "MMAL cam failed to open"
msgstr ""
#: src/video_common.c
msgid "Opening Netcam RTSP"
msgid "Opening Netcam"
msgstr ""
#: src/video_common.c
msgid "Netcam RTSP failed to open"
msgid "Netcam failed to open"
msgstr ""
#: src/video_common.c

8
po/es.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 4.x\n"
"Report-Msgid-Bugs-To: https://motion-project.github.io\n"
"POT-Creation-Date: 2019-09-25 22:32-0600\n"
"POT-Creation-Date: 2019-09-25 23:02-0600\n"
"PO-Revision-Date: 2018-10-13 12:00-0600\n"
"Last-Translator: MrDave <MotionMrDave@gmail.com>\n"
"Language-Team: MrDave <MotionMrDave@gmail.com>\n"
@@ -2601,7 +2601,7 @@ msgid "calling mmalcam_cleanup"
msgstr ""
#: src/video_common.c
msgid "calling netcam_rtsp_cleanup"
msgid "calling netcam_cleanup"
msgstr ""
#: src/video_common.c
@@ -2621,11 +2621,11 @@ msgid "MMAL cam failed to open"
msgstr ""
#: src/video_common.c
msgid "Opening Netcam RTSP"
msgid "Opening Netcam"
msgstr ""
#: src/video_common.c
msgid "Netcam RTSP failed to open"
msgid "Netcam failed to open"
msgstr ""
#: src/video_common.c

8
po/fi.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 4.x\n"
"Report-Msgid-Bugs-To: https://motion-project.github.io\n"
"POT-Creation-Date: 2019-09-25 22:32-0600\n"
"POT-Creation-Date: 2019-09-25 23:02-0600\n"
"PO-Revision-Date: 2018-10-13 12:00-0600\n"
"Last-Translator: MrDave <MotionMrDave@gmail.com>\n"
"Language-Team: MrDave <MotionMrDave@gmail.com>\n"
@@ -2600,7 +2600,7 @@ msgid "calling mmalcam_cleanup"
msgstr ""
#: src/video_common.c
msgid "calling netcam_rtsp_cleanup"
msgid "calling netcam_cleanup"
msgstr ""
#: src/video_common.c
@@ -2620,11 +2620,11 @@ msgid "MMAL cam failed to open"
msgstr ""
#: src/video_common.c
msgid "Opening Netcam RTSP"
msgid "Opening Netcam"
msgstr ""
#: src/video_common.c
msgid "Netcam RTSP failed to open"
msgid "Netcam failed to open"
msgstr ""
#: src/video_common.c

8
po/fr.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 4.x\n"
"Report-Msgid-Bugs-To: https://motion-project.github.io\n"
"POT-Creation-Date: 2019-09-25 22:32-0600\n"
"POT-Creation-Date: 2019-09-25 23:02-0600\n"
"PO-Revision-Date: 2018-10-13 12:01-0600\n"
"Last-Translator: MrDave <MotionMrDave@gmail.com>\n"
"Language-Team: MrDave <MotionMrDave@gmail.com>\n"
@@ -2607,7 +2607,7 @@ msgid "calling mmalcam_cleanup"
msgstr ""
#: src/video_common.c
msgid "calling netcam_rtsp_cleanup"
msgid "calling netcam_cleanup"
msgstr ""
#: src/video_common.c
@@ -2627,11 +2627,11 @@ msgid "MMAL cam failed to open"
msgstr ""
#: src/video_common.c
msgid "Opening Netcam RTSP"
msgid "Opening Netcam"
msgstr ""
#: src/video_common.c
msgid "Netcam RTSP failed to open"
msgid "Netcam failed to open"
msgstr ""
#: src/video_common.c

8
po/it.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 4.x\n"
"Report-Msgid-Bugs-To: https://motion-project.github.io\n"
"POT-Creation-Date: 2019-09-25 22:32-0600\n"
"POT-Creation-Date: 2019-09-25 23:02-0600\n"
"PO-Revision-Date: 2018-10-13 12:02-0600\n"
"Last-Translator: MrDave <MotionMrDave@gmail.com>\n"
"Language-Team: MrDave <MotionMrDave@gmail.com>\n"
@@ -2600,7 +2600,7 @@ msgid "calling mmalcam_cleanup"
msgstr ""
#: src/video_common.c
msgid "calling netcam_rtsp_cleanup"
msgid "calling netcam_cleanup"
msgstr ""
#: src/video_common.c
@@ -2620,11 +2620,11 @@ msgid "MMAL cam failed to open"
msgstr ""
#: src/video_common.c
msgid "Opening Netcam RTSP"
msgid "Opening Netcam"
msgstr ""
#: src/video_common.c
msgid "Netcam RTSP failed to open"
msgid "Netcam failed to open"
msgstr ""
#: src/video_common.c

8
po/ja.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 4.x\n"
"Report-Msgid-Bugs-To: https://motion-project.github.io\n"
"POT-Creation-Date: 2019-09-25 22:32-0600\n"
"POT-Creation-Date: 2019-09-25 23:02-0600\n"
"PO-Revision-Date: 2018-10-13 12:02-0600\n"
"Last-Translator: MrDave <MotionMrDave@gmail.com>\n"
"Language-Team: MrDave <MotionMrDave@gmail.com>\n"
@@ -2600,7 +2600,7 @@ msgid "calling mmalcam_cleanup"
msgstr ""
#: src/video_common.c
msgid "calling netcam_rtsp_cleanup"
msgid "calling netcam_cleanup"
msgstr ""
#: src/video_common.c
@@ -2620,11 +2620,11 @@ msgid "MMAL cam failed to open"
msgstr ""
#: src/video_common.c
msgid "Opening Netcam RTSP"
msgid "Opening Netcam"
msgstr ""
#: src/video_common.c
msgid "Netcam RTSP failed to open"
msgid "Netcam failed to open"
msgstr ""
#: src/video_common.c

8
po/ko.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 4.x\n"
"Report-Msgid-Bugs-To: https://motion-project.github.io\n"
"POT-Creation-Date: 2019-09-25 22:32-0600\n"
"POT-Creation-Date: 2019-09-25 23:02-0600\n"
"PO-Revision-Date: 2018-10-13 12:02-0600\n"
"Last-Translator: MrDave <MotionMrDave@gmail.com>\n"
"Language-Team: MrDave <MotionMrDave@gmail.com>\n"
@@ -2600,7 +2600,7 @@ msgid "calling mmalcam_cleanup"
msgstr ""
#: src/video_common.c
msgid "calling netcam_rtsp_cleanup"
msgid "calling netcam_cleanup"
msgstr ""
#: src/video_common.c
@@ -2620,11 +2620,11 @@ msgid "MMAL cam failed to open"
msgstr ""
#: src/video_common.c
msgid "Opening Netcam RTSP"
msgid "Opening Netcam"
msgstr ""
#: src/video_common.c
msgid "Netcam RTSP failed to open"
msgid "Netcam failed to open"
msgstr ""
#: src/video_common.c

8
po/li.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 4.x\n"
"Report-Msgid-Bugs-To: https://motion-project.github.io\n"
"POT-Creation-Date: 2019-09-25 22:32-0600\n"
"POT-Creation-Date: 2019-09-25 23:02-0600\n"
"PO-Revision-Date: 2018-10-13 12:02-0600\n"
"Last-Translator: MrDave <MotionMrDave@gmail.com>\n"
"Language-Team: MrDave <MotionMrDave@gmail.com>\n"
@@ -2601,7 +2601,7 @@ msgid "calling mmalcam_cleanup"
msgstr ""
#: src/video_common.c
msgid "calling netcam_rtsp_cleanup"
msgid "calling netcam_cleanup"
msgstr ""
#: src/video_common.c
@@ -2621,11 +2621,11 @@ msgid "MMAL cam failed to open"
msgstr ""
#: src/video_common.c
msgid "Opening Netcam RTSP"
msgid "Opening Netcam"
msgstr ""
#: src/video_common.c
msgid "Netcam RTSP failed to open"
msgid "Netcam failed to open"
msgstr ""
#: src/video_common.c

8
po/nl.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 4.x\n"
"Report-Msgid-Bugs-To: https://motion-project.github.io\n"
"POT-Creation-Date: 2019-09-25 22:32-0600\n"
"POT-Creation-Date: 2019-09-25 23:02-0600\n"
"PO-Revision-Date: 2018-10-13 12:03-0600\n"
"Last-Translator: MrDave <MotionMrDave@gmail.com>\n"
"Language-Team: MrDave <MotionMrDave@gmail.com>\n"
@@ -2600,7 +2600,7 @@ msgid "calling mmalcam_cleanup"
msgstr ""
#: src/video_common.c
msgid "calling netcam_rtsp_cleanup"
msgid "calling netcam_cleanup"
msgstr ""
#: src/video_common.c
@@ -2620,11 +2620,11 @@ msgid "MMAL cam failed to open"
msgstr ""
#: src/video_common.c
msgid "Opening Netcam RTSP"
msgid "Opening Netcam"
msgstr ""
#: src/video_common.c
msgid "Netcam RTSP failed to open"
msgid "Netcam failed to open"
msgstr ""
#: src/video_common.c

8
po/no.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 4.x\n"
"Report-Msgid-Bugs-To: https://motion-project.github.io\n"
"POT-Creation-Date: 2019-09-25 22:32-0600\n"
"POT-Creation-Date: 2019-09-25 23:02-0600\n"
"PO-Revision-Date: 2018-10-13 12:03-0600\n"
"Last-Translator: MrDave <MotionMrDave@gmail.com>\n"
"Language-Team: MrDave <MotionMrDave@gmail.com>\n"
@@ -2600,7 +2600,7 @@ msgid "calling mmalcam_cleanup"
msgstr ""
#: src/video_common.c
msgid "calling netcam_rtsp_cleanup"
msgid "calling netcam_cleanup"
msgstr ""
#: src/video_common.c
@@ -2620,11 +2620,11 @@ msgid "MMAL cam failed to open"
msgstr ""
#: src/video_common.c
msgid "Opening Netcam RTSP"
msgid "Opening Netcam"
msgstr ""
#: src/video_common.c
msgid "Netcam RTSP failed to open"
msgid "Netcam failed to open"
msgstr ""
#: src/video_common.c

8
po/pt.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 4.x\n"
"Report-Msgid-Bugs-To: https://motion-project.github.io\n"
"POT-Creation-Date: 2019-09-25 22:32-0600\n"
"POT-Creation-Date: 2019-09-25 23:02-0600\n"
"PO-Revision-Date: 2018-10-13 12:03-0600\n"
"Last-Translator: MrDave <MotionMrDave@gmail.com>\n"
"Language-Team: MrDave <MotionMrDave@gmail.com>\n"
@@ -2600,7 +2600,7 @@ msgid "calling mmalcam_cleanup"
msgstr ""
#: src/video_common.c
msgid "calling netcam_rtsp_cleanup"
msgid "calling netcam_cleanup"
msgstr ""
#: src/video_common.c
@@ -2620,11 +2620,11 @@ msgid "MMAL cam failed to open"
msgstr ""
#: src/video_common.c
msgid "Opening Netcam RTSP"
msgid "Opening Netcam"
msgstr ""
#: src/video_common.c
msgid "Netcam RTSP failed to open"
msgid "Netcam failed to open"
msgstr ""
#: src/video_common.c

8
po/sv.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 4.x\n"
"Report-Msgid-Bugs-To: https://motion-project.github.io\n"
"POT-Creation-Date: 2019-09-25 22:32-0600\n"
"POT-Creation-Date: 2019-09-25 23:02-0600\n"
"PO-Revision-Date: 2018-10-13 12:04-0600\n"
"Last-Translator: MrDave <MotionMrDave@gmail.com>\n"
"Language-Team: MrDave <MotionMrDave@gmail.com>\n"
@@ -2600,7 +2600,7 @@ msgid "calling mmalcam_cleanup"
msgstr ""
#: src/video_common.c
msgid "calling netcam_rtsp_cleanup"
msgid "calling netcam_cleanup"
msgstr ""
#: src/video_common.c
@@ -2620,11 +2620,11 @@ msgid "MMAL cam failed to open"
msgstr ""
#: src/video_common.c
msgid "Opening Netcam RTSP"
msgid "Opening Netcam"
msgstr ""
#: src/video_common.c
msgid "Netcam RTSP failed to open"
msgid "Netcam failed to open"
msgstr ""
#: src/video_common.c

8
po/zh.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 4.x\n"
"Report-Msgid-Bugs-To: https://motion-project.github.io\n"
"POT-Creation-Date: 2019-09-25 22:32-0600\n"
"POT-Creation-Date: 2019-09-25 23:02-0600\n"
"PO-Revision-Date: 2018-10-13 12:04-0600\n"
"Last-Translator: MrDave <MotionMrDave@gmail.com>\n"
"Language-Team: MrDave <MotionMrDave@gmail.com>\n"
@@ -2600,7 +2600,7 @@ msgid "calling mmalcam_cleanup"
msgstr ""
#: src/video_common.c
msgid "calling netcam_rtsp_cleanup"
msgid "calling netcam_cleanup"
msgstr ""
#: src/video_common.c
@@ -2620,11 +2620,11 @@ msgid "MMAL cam failed to open"
msgstr ""
#: src/video_common.c
msgid "Opening Netcam RTSP"
msgid "Opening Netcam"
msgstr ""
#: src/video_common.c
msgid "Netcam RTSP failed to open"
msgid "Netcam failed to open"
msgstr ""
#: src/video_common.c

10
src/event.c
View File

@@ -1033,12 +1033,12 @@ static void event_movie_newfile(struct context *cnt,
cnt->movie_output->width = cnt->imgs.width_high;
cnt->movie_output->height = cnt->imgs.height_high;
cnt->movie_output->high_resolution = TRUE;
cnt->movie_output->rtsp_data = cnt->rtsp_high;
cnt->movie_output->netcam_data = cnt->netcam_high;
} else {
cnt->movie_output->width = cnt->imgs.width;
cnt->movie_output->height = cnt->imgs.height;
cnt->movie_output->high_resolution = FALSE;
cnt->movie_output->rtsp_data = cnt->rtsp;
cnt->movie_output->netcam_data = cnt->netcam;
}
cnt->movie_output->tlapse = TIMELAPSE_NONE;
cnt->movie_output->fps = cnt->movie_fps;
@@ -1075,7 +1075,7 @@ static void event_movie_newfile(struct context *cnt,
cnt->movie_output_motion = mymalloc(sizeof(struct ctx_movie));
cnt->movie_output_motion->width = cnt->imgs.width;
cnt->movie_output_motion->height = cnt->imgs.height;
cnt->movie_output_motion->rtsp_data = NULL;
cnt->movie_output_motion->netcam_data = NULL;
cnt->movie_output_motion->tlapse = TIMELAPSE_NONE;
cnt->movie_output_motion->fps = cnt->movie_fps;
cnt->movie_output_motion->bps = cnt->conf.movie_bps;
@@ -1095,7 +1095,7 @@ static void event_movie_newfile(struct context *cnt,
cnt->movie_output_motion->motion_images = TRUE;
cnt->movie_output_motion->passthrough = FALSE;
cnt->movie_output_motion->high_resolution = FALSE;
cnt->movie_output_motion->rtsp_data = NULL;
cnt->movie_output_motion->netcam_data = NULL;
retcd = movie_open(cnt->movie_output_motion);
if (retcd < 0){
@@ -1162,7 +1162,7 @@ static void event_movie_timelapse(struct context *cnt,
cnt->movie_timelapse->gop_cnt = 0;
cnt->movie_timelapse->motion_images = FALSE;
cnt->movie_timelapse->passthrough = FALSE;
cnt->movie_timelapse->rtsp_data = NULL;
cnt->movie_timelapse->netcam_data = NULL;
if ((strcmp(cnt->conf.timelapse_codec,"mpg") == 0) ||
(strcmp(cnt->conf.timelapse_codec,"swf") == 0) ){

48
src/motion.c
View File

@@ -271,8 +271,8 @@ static void context_init(struct context *cnt)
cnt->vdev = NULL; /*Init to NULL to check loading parms vs web updates*/
cnt->netcam = NULL;
cnt->rtsp = NULL;
cnt->rtsp_high = NULL;
cnt->netcam = NULL;
cnt->netcam_high = NULL;
}
@@ -743,7 +743,7 @@ static int init_camera_type(struct context *cnt){
(strncmp(cnt->conf.netcam_url,"file" ,4) == 0) ||
(strncmp(cnt->conf.netcam_url,"rtmp" ,4) == 0) ||
(strncmp(cnt->conf.netcam_url,"rtsp" ,4) == 0)) {
cnt->camera_type = CAMERA_TYPE_RTSP;
cnt->camera_type = CAMERA_TYPE_NETCAM;
}
return 0;
}
@@ -1238,7 +1238,7 @@ static int motion_init(struct context *cnt)
if (init_camera_type(cnt) != 0 ) return -3;
if ((cnt->camera_type != CAMERA_TYPE_RTSP) &&
if ((cnt->camera_type != CAMERA_TYPE_NETCAM) &&
(cnt->movie_passthrough)) {
MOTION_LOG(WRN, TYPE_ALL, NO_ERRNO,_("Pass-through processing disabled."));
cnt->movie_passthrough = FALSE;
@@ -3418,42 +3418,42 @@ static void motion_watchdog(int indx){
MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO
,_("Thread %d - Watchdog timeout did NOT restart, killing it!")
, cnt_list[indx]->threadnr);
if ((cnt_list[indx]->camera_type == CAMERA_TYPE_RTSP) &&
(cnt_list[indx]->rtsp != NULL)){
pthread_cancel(cnt_list[indx]->rtsp->thread_id);
if ((cnt_list[indx]->camera_type == CAMERA_TYPE_NETCAM) &&
(cnt_list[indx]->netcam != NULL)){
pthread_cancel(cnt_list[indx]->netcam->thread_id);
}
if ((cnt_list[indx]->camera_type == CAMERA_TYPE_RTSP) &&
(cnt_list[indx]->rtsp_high != NULL)){
pthread_cancel(cnt_list[indx]->rtsp_high->thread_id);
if ((cnt_list[indx]->camera_type == CAMERA_TYPE_NETCAM) &&
(cnt_list[indx]->netcam_high != NULL)){
pthread_cancel(cnt_list[indx]->netcam_high->thread_id);
}
pthread_cancel(cnt_list[indx]->thread_id);
}
if (cnt_list[indx]->watchdog < WATCHDOG_KILL) {
if ((cnt_list[indx]->camera_type == CAMERA_TYPE_RTSP) &&
(cnt_list[indx]->rtsp != NULL)){
if (!cnt_list[indx]->rtsp->handler_finished &&
pthread_kill(cnt_list[indx]->rtsp->thread_id, 0) == ESRCH) {
cnt_list[indx]->rtsp->handler_finished = TRUE;
if ((cnt_list[indx]->camera_type == CAMERA_TYPE_NETCAM) &&
(cnt_list[indx]->netcam != NULL)){
if (!cnt_list[indx]->netcam->handler_finished &&
pthread_kill(cnt_list[indx]->netcam->thread_id, 0) == ESRCH) {
cnt_list[indx]->netcam->handler_finished = TRUE;
pthread_mutex_lock(&global_lock);
threads_running--;
pthread_mutex_unlock(&global_lock);
netcam_rtsp_cleanup(cnt_list[indx],FALSE);
netcam_cleanup(cnt_list[indx],FALSE);
} else {
pthread_kill(cnt_list[indx]->rtsp->thread_id, SIGVTALRM);
pthread_kill(cnt_list[indx]->netcam->thread_id, SIGVTALRM);
}
}
if ((cnt_list[indx]->camera_type == CAMERA_TYPE_RTSP) &&
(cnt_list[indx]->rtsp_high != NULL)){
if (!cnt_list[indx]->rtsp_high->handler_finished &&
pthread_kill(cnt_list[indx]->rtsp_high->thread_id, 0) == ESRCH) {
cnt_list[indx]->rtsp_high->handler_finished = TRUE;
if ((cnt_list[indx]->camera_type == CAMERA_TYPE_NETCAM) &&
(cnt_list[indx]->netcam_high != NULL)){
if (!cnt_list[indx]->netcam_high->handler_finished &&
pthread_kill(cnt_list[indx]->netcam_high->thread_id, 0) == ESRCH) {
cnt_list[indx]->netcam_high->handler_finished = TRUE;
pthread_mutex_lock(&global_lock);
threads_running--;
pthread_mutex_unlock(&global_lock);
netcam_rtsp_cleanup(cnt_list[indx],FALSE);
netcam_cleanup(cnt_list[indx],FALSE);
} else {
pthread_kill(cnt_list[indx]->rtsp_high->thread_id, SIGVTALRM);
pthread_kill(cnt_list[indx]->netcam_high->thread_id, SIGVTALRM);
}
}
if (cnt_list[indx]->running &&

8
src/motion.h
View File

@@ -201,7 +201,7 @@ enum CAMERA_TYPE {
CAMERA_TYPE_UNKNOWN,
CAMERA_TYPE_V4L2,
CAMERA_TYPE_MMAL,
CAMERA_TYPE_RTSP
CAMERA_TYPE_NETCAM
};
enum WEBUI_LEVEL{
@@ -380,12 +380,12 @@ struct context {
int track_posy;
enum CAMERA_TYPE camera_type;
struct netcam_context *netcam;
#ifdef HAVE_MMAL
struct mmalcam_context *mmalcam;
#endif
struct rtsp_context *rtsp; /* this structure contains the context for normal RTSP connection */
struct rtsp_context *rtsp_high; /* this structure contains the context for high resolution RTSP connection */
struct ctx_netcam *netcam; /* this structure contains the context for normal RTSP connection */
struct ctx_netcam *netcam_high; /* this structure contains the context for high resolution RTSP connection */
struct vdev_context *vdev; /* Structure for v4l2 device information */

86
src/movie.c
View File

@@ -1153,11 +1153,11 @@ static void movie_passthru_reset(struct ctx_movie *movie){
/* Reset the written flag at start of each event */
int indx;
pthread_mutex_lock(&movie->rtsp_data->mutex_pktarray);
for(indx = 0; indx < movie->rtsp_data->pktarray_size; indx++) {
movie->rtsp_data->pktarray[indx].iswritten = FALSE;
pthread_mutex_lock(&movie->netcam_data->mutex_pktarray);
for(indx = 0; indx < movie->netcam_data->pktarray_size; indx++) {
movie->netcam_data->pktarray[indx].iswritten = FALSE;
}
pthread_mutex_unlock(&movie->rtsp_data->mutex_pktarray);
pthread_mutex_unlock(&movie->netcam_data->mutex_pktarray);
}
@@ -1171,9 +1171,9 @@ static void movie_passthru_write(struct ctx_movie *movie, int indx){
movie->pkt.size = 0;
movie->rtsp_data->pktarray[indx].iswritten = TRUE;
movie->netcam_data->pktarray[indx].iswritten = TRUE;
retcd = my_copy_packet(&movie->pkt, &movie->rtsp_data->pktarray[indx].packet);
retcd = my_copy_packet(&movie->pkt, &movie->netcam_data->pktarray[indx].packet);
if (retcd < 0) {
av_strerror(retcd, errstr, sizeof(errstr));
MOTION_LOG(INF, TYPE_ENCODER, NO_ERRNO, "av_copy_packet: %s",errstr);
@@ -1181,7 +1181,7 @@ static void movie_passthru_write(struct ctx_movie *movie, int indx){
return;
}
retcd = movie_set_pktpts(movie, &movie->rtsp_data->pktarray[indx].timestamp_tv);
retcd = movie_set_pktpts(movie, &movie->netcam_data->pktarray[indx].timestamp_tv);
if (retcd < 0) {
my_packet_unref(movie->pkt);
return;
@@ -1205,10 +1205,10 @@ static int movie_passthru_put(struct ctx_movie *movie, struct image_data *img_da
int idnbr_image, idnbr_lastwritten, idnbr_stop, idnbr_firstkey;
int indx, indx_lastwritten, indx_firstkey;
if (movie->rtsp_data == NULL) return -1;
if (movie->netcam_data == NULL) return -1;
if ((movie->rtsp_data->status == RTSP_NOTCONNECTED ) ||
(movie->rtsp_data->status == RTSP_RECONNECTING ) ){
if ((movie->netcam_data->status == NETCAM_NOTCONNECTED ) ||
(movie->netcam_data->status == NETCAM_RECONNECTING ) ){
return 0;
}
@@ -1218,32 +1218,32 @@ static int movie_passthru_put(struct ctx_movie *movie, struct image_data *img_da
idnbr_image = img_data->idnbr_norm;
}
pthread_mutex_lock(&movie->rtsp_data->mutex_pktarray);
pthread_mutex_lock(&movie->netcam_data->mutex_pktarray);
idnbr_lastwritten = 0;
idnbr_firstkey = idnbr_image;
idnbr_stop = 0;
indx_lastwritten = -1;
indx_firstkey = -1;
for(indx = 0; indx < movie->rtsp_data->pktarray_size; indx++) {
if ((movie->rtsp_data->pktarray[indx].iswritten) &&
(movie->rtsp_data->pktarray[indx].idnbr > idnbr_lastwritten)){
idnbr_lastwritten=movie->rtsp_data->pktarray[indx].idnbr;
for(indx = 0; indx < movie->netcam_data->pktarray_size; indx++) {
if ((movie->netcam_data->pktarray[indx].iswritten) &&
(movie->netcam_data->pktarray[indx].idnbr > idnbr_lastwritten)){
idnbr_lastwritten=movie->netcam_data->pktarray[indx].idnbr;
indx_lastwritten = indx;
}
if ((movie->rtsp_data->pktarray[indx].idnbr > idnbr_stop) &&
(movie->rtsp_data->pktarray[indx].idnbr <= idnbr_image)){
idnbr_stop=movie->rtsp_data->pktarray[indx].idnbr;
if ((movie->netcam_data->pktarray[indx].idnbr > idnbr_stop) &&
(movie->netcam_data->pktarray[indx].idnbr <= idnbr_image)){
idnbr_stop=movie->netcam_data->pktarray[indx].idnbr;
}
if ((movie->rtsp_data->pktarray[indx].iskey) &&
(movie->rtsp_data->pktarray[indx].idnbr <= idnbr_firstkey)){
idnbr_firstkey=movie->rtsp_data->pktarray[indx].idnbr;
if ((movie->netcam_data->pktarray[indx].iskey) &&
(movie->netcam_data->pktarray[indx].idnbr <= idnbr_firstkey)){
idnbr_firstkey=movie->netcam_data->pktarray[indx].idnbr;
indx_firstkey = indx;
}
}
if (idnbr_stop == 0){
pthread_mutex_unlock(&movie->rtsp_data->mutex_pktarray);
pthread_mutex_unlock(&movie->netcam_data->mutex_pktarray);
return 0;
}
@@ -1256,17 +1256,17 @@ static int movie_passthru_put(struct ctx_movie *movie, struct image_data *img_da
}
while (TRUE){
if ((!movie->rtsp_data->pktarray[indx].iswritten) &&
(movie->rtsp_data->pktarray[indx].packet.size > 0) &&
(movie->rtsp_data->pktarray[indx].idnbr > idnbr_lastwritten) &&
(movie->rtsp_data->pktarray[indx].idnbr <= idnbr_image)) {
if ((!movie->netcam_data->pktarray[indx].iswritten) &&
(movie->netcam_data->pktarray[indx].packet.size > 0) &&
(movie->netcam_data->pktarray[indx].idnbr > idnbr_lastwritten) &&
(movie->netcam_data->pktarray[indx].idnbr <= idnbr_image)) {
movie_passthru_write(movie, indx);
}
if (movie->rtsp_data->pktarray[indx].idnbr == idnbr_stop) break;
if (movie->netcam_data->pktarray[indx].idnbr == idnbr_stop) break;
indx++;
if (indx == movie->rtsp_data->pktarray_size ) indx = 0;
if (indx == movie->netcam_data->pktarray_size ) indx = 0;
}
pthread_mutex_unlock(&movie->rtsp_data->mutex_pktarray);
pthread_mutex_unlock(&movie->netcam_data->mutex_pktarray);
return 0;
}
@@ -1275,18 +1275,18 @@ static int movie_passthru_codec(struct ctx_movie *movie){
int retcd;
AVStream *stream_in;
if (movie->rtsp_data == NULL){
if (movie->netcam_data == NULL){
MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("RTSP context not available."));
return -1;
}
pthread_mutex_lock(&movie->rtsp_data->mutex_transfer);
pthread_mutex_lock(&movie->netcam_data->mutex_transfer);
if ((movie->rtsp_data->status == RTSP_NOTCONNECTED ) ||
(movie->rtsp_data->status == RTSP_RECONNECTING ) ){
if ((movie->netcam_data->status == NETCAM_NOTCONNECTED ) ||
(movie->netcam_data->status == NETCAM_RECONNECTING ) ){
MOTION_LOG(NTC, TYPE_ENCODER, NO_ERRNO
,_("rtsp camera not ready for pass-through."));
pthread_mutex_unlock(&movie->rtsp_data->mutex_transfer);
pthread_mutex_unlock(&movie->netcam_data->mutex_transfer);
return -1;
}
@@ -1299,57 +1299,57 @@ static int movie_passthru_codec(struct ctx_movie *movie){
retcd = movie_get_oformat(movie);
if (retcd < 0 ) {
MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not get codec!"));
pthread_mutex_unlock(&movie->rtsp_data->mutex_transfer);
pthread_mutex_unlock(&movie->netcam_data->mutex_transfer);
return -1;
}
#if (LIBAVFORMAT_VERSION_MAJOR >= 58) || ((LIBAVFORMAT_VERSION_MAJOR == 57) && (LIBAVFORMAT_VERSION_MINOR >= 41))
stream_in = movie->rtsp_data->transfer_format->streams[0];
stream_in = movie->netcam_data->transfer_format->streams[0];
movie->oc->oformat->video_codec = stream_in->codecpar->codec_id;
movie->video_st = avformat_new_stream(movie->oc, NULL);
if (!movie->video_st) {
MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not alloc stream"));
pthread_mutex_unlock(&movie->rtsp_data->mutex_transfer);
pthread_mutex_unlock(&movie->netcam_data->mutex_transfer);
return -1;
}
retcd = avcodec_parameters_copy(movie->video_st->codecpar, stream_in->codecpar);
if (retcd < 0){
MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Unable to copy codec parameters"));
pthread_mutex_unlock(&movie->rtsp_data->mutex_transfer);
pthread_mutex_unlock(&movie->netcam_data->mutex_transfer);
return -1;
}
movie->video_st->codecpar->codec_tag = 0;
#elif (LIBAVFORMAT_VERSION_MAJOR >= 55)
stream_in = movie->rtsp_data->transfer_format->streams[0];
stream_in = movie->netcam_data->transfer_format->streams[0];
movie->video_st = avformat_new_stream(movie->oc, stream_in->codec->codec);
if (!movie->video_st) {
MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not alloc stream"));
pthread_mutex_unlock(&movie->rtsp_data->mutex_transfer);
pthread_mutex_unlock(&movie->netcam_data->mutex_transfer);
return -1;
}
retcd = avcodec_copy_context(movie->video_st->codec, stream_in->codec);
if (retcd < 0){
MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Unable to copy codec parameters"));
pthread_mutex_unlock(&movie->rtsp_data->mutex_transfer);
pthread_mutex_unlock(&movie->netcam_data->mutex_transfer);
return -1;
}
movie->video_st->codec->flags |= MY_CODEC_FLAG_GLOBAL_HEADER;
movie->video_st->codec->codec_tag = 0;
#else
/* This is disabled in the util_check_passthrough but we need it here for compiling */
pthread_mutex_unlock(&movie->rtsp_data->mutex_transfer);
pthread_mutex_unlock(&movie->netcam_data->mutex_transfer);
MOTION_LOG(INF, TYPE_ENCODER, NO_ERRNO, _("Pass-through disabled. ffmpeg too old"));
return -1;
#endif
movie->video_st->time_base = stream_in->time_base;
pthread_mutex_unlock(&movie->rtsp_data->mutex_transfer);
pthread_mutex_unlock(&movie->netcam_data->mutex_transfer);
MOTION_LOG(INF, TYPE_ENCODER, NO_ERRNO, "Pass-through stream opened");
return 0;

4
src/movie.h
View File

@@ -7,7 +7,7 @@
#include <stdint.h>
#include "config.h"
struct image_data; /* forward declare for functions */
struct rtsp_context;
struct ctx_netcam;
enum TIMELAPSE_TYPE {
TIMELAPSE_NONE, /* No timelapse, regular processing */
@@ -47,7 +47,7 @@ struct ctx_movie {
AVPacket pkt;
AVFrame *picture; /* contains default image pointers */
AVDictionary *opts;
struct rtsp_context *rtsp_data;
struct ctx_netcam *netcam_data;
int width;
int height;
enum TIMELAPSE_TYPE tlapse;

1172
src/netcam.c
View File

File diff suppressed because it is too large Load Diff

20
src/netcam.h
View File

@@ -8,11 +8,11 @@ struct image_data;
#define NETCAM_RESTART_ERROR 0x12 /* binary 010010 */
#define NETCAM_BUFFSIZE 4096
enum RTSP_STATUS {
RTSP_CONNECTED, /* The camera is currently connected */
RTSP_READINGIMAGE, /* Motion is reading a image from camera */
RTSP_NOTCONNECTED, /* The camera has never connected */
RTSP_RECONNECTING /* Motion is trying to reconnect to camera */
enum NETCAM_STATUS {
NETCAM_CONNECTED, /* The camera is currently connected */
NETCAM_READINGIMAGE, /* Motion is reading a image from camera */
NETCAM_NOTCONNECTED, /* The camera has never connected */
NETCAM_RECONNECTING /* Motion is trying to reconnect to camera */
};
struct imgsize_context {
@@ -61,7 +61,7 @@ struct packet_item{
struct timeval timestamp_tv;
};
struct rtsp_context {
struct ctx_netcam {
AVFormatContext *format_context; /* Main format context for the camera */
AVCodecContext *codec_context; /* Codec being sent from the camera */
AVFrame *frame; /* Reusable frame for images from camera */
@@ -78,7 +78,7 @@ struct rtsp_context {
int swsframe_size; /* The size of the image after resizing */
int video_stream_index; /* Stream index associated with video from camera */
enum RTSP_STATUS status; /* Status of whether the camera is connecting, closed, etc*/
enum NETCAM_STATUS status; /* Status of whether the camera is connecting, closed, etc*/
struct timeval interruptstarttime; /* The time set before calling the av functions */
struct timeval interruptcurrenttime; /* Time during the interrupt to determine duration since start*/
int interruptduration; /* Seconds permitted before triggering a interrupt */
@@ -118,8 +118,8 @@ struct rtsp_context {
};
int netcam_rtsp_setup(struct context *cnt);
int netcam_rtsp_next(struct context *cnt, struct image_data *img_data);
void netcam_rtsp_cleanup(struct context *cnt, int init_retry_flag);
int netcam_setup(struct context *cnt);
int netcam_next(struct context *cnt, struct image_data *img_data);
void netcam_cleanup(struct context *cnt, int init_retry_flag);
#endif /* _INCLUDE_NETCAM_H */

20
src/video_common.c
View File

@@ -656,10 +656,10 @@ void vid_close(struct context *cnt) {
}
#endif
if (cnt->rtsp) {
if (cnt->netcam) {
/* This also cleans up high resolution */
MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO,_("calling netcam_rtsp_cleanup"));
netcam_rtsp_cleanup(cnt, 0);
MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO,_("calling netcam_cleanup"));
netcam_cleanup(cnt, 0);
return;
}
@@ -712,12 +712,12 @@ int vid_start(struct context *cnt) {
}
#endif
if (cnt->camera_type == CAMERA_TYPE_RTSP) {
MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO,_("Opening Netcam RTSP"));
dev = netcam_rtsp_setup(cnt);
if (cnt->camera_type == CAMERA_TYPE_NETCAM) {
MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO,_("Opening Netcam"));
dev = netcam_setup(cnt);
if (dev < 0) {
netcam_rtsp_cleanup(cnt, 1);
MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO,_("Netcam RTSP failed to open"));
netcam_cleanup(cnt, 1);
MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO,_("Netcam failed to open"));
}
return dev;
}
@@ -768,11 +768,11 @@ int vid_next(struct context *cnt, struct image_data *img_data){
}
#endif
if (cnt->camera_type == CAMERA_TYPE_RTSP) {
if (cnt->camera_type == CAMERA_TYPE_NETCAM) {
if (cnt->video_dev == -1)
return NETCAM_GENERAL_ERROR;
return netcam_rtsp_next(cnt, img_data);
return netcam_next(cnt, img_data);
}
if (cnt->camera_type == CAMERA_TYPE_V4L2) {