ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,328 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

33 Commits

Author SHA1 Message Date
SteveGilvarry 4a492ce088 Fix some issues from the merge conflict 2014-12-02 21:49:50 +11:00
SteveGilvarry cc85424999 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/zm_ffmpeg_camera.cpp
 2014-12-02 20:18:24 +11:00
SteveGilvarry d8351eb1e3 mp4 changes 2014-11-25 20:28:18 +11:00
SteveGilvarry 8d71d4de03 Swap to mp4 container 2014-11-09 18:15:43 +11:00
SteveGilvarry 4245928b35 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/CMakeLists.txt
	src/zm_monitor.cpp
	web/skins/classic/js/skin.js
 2014-10-12 20:10:36 +11:00
SteveGilvarry 6cb96f1316 Put opts back in 2014-10-12 16:47:27 +11:00
Sune1337 7534557533 - join reconnect thread when finished to clean up thread resources. 
- don't spawn a new thread for every attempt to open a stream while reconnecting.
 2014-10-12 16:31:27 +11:00
Sune1337 a865a555f2 Define AV_ERROR_MAX_STRING_SIZE after all include files to use ffmpeg define if it exists. 2014-10-12 16:31:27 +11:00
Sune1337 f32b1276df Define AV_ERROR_MAX_STRING_SIZE to 64 if it is not already defined. 2014-10-12 16:23:58 +11:00
Sune1337 83d2a494c3 Process should exit if ReopenFfmpeg function fails to create a worker thread. 2014-10-12 16:23:58 +11:00
Sune1337 7de59df080 removed use of av_err2str. someone could not compile when using that macro. 2014-10-12 16:23:58 +11:00
Sune1337 a307b8a1e3 Use value from options (FFMPEG_OPEN_TIMEOUT) as timeout when calling av_open_input_file. 2014-10-12 16:23:58 +11:00
Sune1337 ebf466c2df - Timeout when opening stream after 10 seconds 
Sometimes when restarting the camera ffmpeg hung itself in some state, when calling avformat_open_input, which seemed to last forever.
- Reopen stream if av_read_frame returns EOF
Sometimes ffmpeg starts returning an EOF error when calling av_read_frame. Once this happens it seems no more images will ever be captured.
- Reopen stream if av_read_frame returns -110
Means something like Connection failed; cant remember. Anyway. Once this happens it seems no more images will ever be captured.
 2014-10-12 16:23:58 +11:00
Andy Bauer 549360cabd Merge branch 'zms/videostream-improvements' of https://github.com/Sune1337/ZoneMinder into Sune1337-zms/videostream-improvements 
Conflicts:
	src/zm_ffmpeg.h
	src/zm_mpeg.cpp
 2014-10-11 15:38:38 -05:00
stevegilvarry 8c81c8df9c Option handled added in master, removing duplicate declaration 2014-06-29 08:50:17 +10:00
stevegilvarry 17d7404c93 Merging master again 2014-06-28 22:50:28 +10:00
Will W 5051c26d31 Audio support including fixes for dts/pts, split on keyframe and update to mkv extension to prevent ffmpeg problems writing rtsp audio to mp4 containter (header problem) 2014-05-30 02:05:20 +10:00
m-bene a81b9b8ce2 change examples for options 2014-05-17 21:48:08 +02:00
m-bene f62afdb8cc add select list for rtsp method for ffmpeg and libvlc 2014-05-17 20:41:22 +02:00
m-bene 9a71a0068a add help window for ffmpeg/libvlc options 2014-05-17 04:33:33 +02:00
m-bene 1b4f9c082c change check for av_dict_set success 2014-05-15 16:01:29 +02:00
m-bene 6016206f98 modify debug message 2014-05-15 15:42:27 +02:00
m-bene 5cb7cd916f add quotes to option debug/warn messages 2014-05-15 15:13:39 +02:00
m-bene c1557a99e5 add debug and warn messages 2014-05-15 15:06:01 +02:00
m-bene ae0ee9b3b3 testing/fixing 2014-05-05 15:54:13 +02:00
m-bene ceff5a98ea add generic Option field to ffmpeg and libvlc cameras 2014-05-05 13:29:12 +02:00
Sune1337 3155d621d0 - Removed an unreferenced variable 
- fixed compilation issue with sws_..isSupported when compiling with ffmpeg 0.5
 2014-04-25 22:57:29 +02:00
Chris Wiggins 8da327e9a3 Keep last keyframe so that as soon as the video starts to record, it has a keyframe to use rather than waiting 2013-09-28 23:26:28 +12:00
Chris Wiggins a7c4d3f3e9 Accidental copy of old logic. Fixed 2013-09-22 10:40:54 +12:00
Chris Wiggins 6a7b38dac6 update changes 2013-09-19 21:55:56 +12:00
Chris Wiggins 774a84d487 Updated event processing to actually add frames into the DB. Use MP4 container 2013-09-14 00:50:54 +12:00
Chris Wiggins c61029f780 First iteration of h264 saving in the capture daemon. 
To use, enable use_mkv_storage in the paths section of the ZM config (be sure to import the new SQL config)
Must have the latest FFMPEG compiled from git with x264 linked in
 2013-09-06 15:07:46 +12:00
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00