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

349 Commits

Author SHA1 Message Date
Kaarle Ritvanen 5b047dc74b zm_event: fix overlap in memcpy buffers 2016-02-20 23:58:36 +02:00
Isaac Connor 89cff287cd Merge branch 'master' into storageareas 2016-02-04 12:14:16 -05:00
SteveGilvarry 7301e803ed Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
 2016-01-30 15:45:08 +11:00
arjunrc 47b2cdbb96 added CMD_QUIT to kill zms via command 2016-01-29 09:58:50 -05:00
Isaac Connor 2597bbd9bf use storage object instead of config.dir_events 2015-12-15 12:09:34 -05:00
SteveGilvarry dc0506c597 Fix build warnings specific to h264 branch, unused FrameImg, unused ret and int64_t snprintf issues 2015-11-04 22:33:29 +11:00
Steve Gilvarry ac8d9fe76a Merge pull request #1118 from liucougar/fix_crash_in_ubuntu1404 
feature-h264-videostorage - Fix segmentation fault in zma with ubuntu 14.04 and ffmpeg 2.5.8 (gcc…
 2015-10-23 22:24:26 +11:00
SteveGilvarry d8494aba2d Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_remote_camera_rtsp.h
	web/skins/classic/views/monitor.php
 2015-10-23 22:07:22 +11:00
Heng Liu fee883f61a fix segmentation fault in zma with ubuntu 14.04 and ffmpeg 2.5.8 (gcc 4.8) 
when libx264 is not installed
 2015-10-22 22:52:41 -07:00
Linwood-F 987db68452 Fix extra image copy; fix options unset of exif toggle 2015-08-18 14:39:55 -04:00
Linwood-F 99c8af4a17 Bring up to date with master (mostly) 2015-08-17 22:52:51 -04:00
Linwood-F 3b9bb6053c Add clarifying comment 2015-08-17 22:10:39 -04:00
Linwood-F 9351e1b9d9 Incorporate exif switch 2015-08-17 22:07:41 -04:00
Andrew Bauer 59c1b83d4f create embed_exif flag in Monitor class 2015-08-16 17:42:12 -05:00
Andrew Bauer 5b0288e5f5 use frame_type instead of score in conditional 2015-08-14 07:03:08 -05:00
Andrew Bauer 19174adfa1 add frame_type to debug message 2015-08-13 20:47:14 -05:00
Andrew Bauer 14dabb095c set scroe to zero if less than zero 2015-08-13 18:06:20 -05:00
Isaac Connor 95087beeb9 use return value of stat instead of just checking errno. This has the added benefit of catching other errors when stating 2015-08-12 11:00:41 -04:00
Linwood-F 72a92ee9d5 Add exif to jpg images saved 2015-07-23 19:34:39 -04:00
SteveGilvarry 9b06b1399c Merge branch 'master' into feature-h264-videostorage 
Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
	scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
	src/zm_ffmpeg_camera.cpp
	web/skins/classic/views/event.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/timeline.php
 2015-06-10 23:09:30 +10:00
rwg0 422020a3b2 Fix fast forward/reverse in event playback not being fast if effectivefps < maxfps 2015-04-22 22:11:33 +01:00
Isaac Connor 0bea381510 sendfile tricks 2015-02-24 09:20:55 -05:00
SteveGilvarry ba425edd0f Convert from event_directory to event file as per Video branch 2015-01-12 20:42:17 +10:00
SteveGilvarry d6e8c66057 Add support for Jpeg save options for h264 branch snapshot. Might remove altogether if snapshots not needed 2014-12-25 05:45:50 +11:00
SteveGilvarry 33ff712f2c Resolve post merge build issues with braces 2014-12-02 22:36:32 +11:00
SteveGilvarry bf33eab17c Merge branch 'video' into feature-h264-videostorage 
Conflicts:
	src/CMakeLists.txt
	src/Makefile.am
	src/zm_event.cpp
	web/skins/classic/views/js/event.js
 2014-12-02 20:58:35 +11:00
Isaac Connor 69090563d5 Merge branch 'master' into video 
Conflicts:
	src/CMakeLists.txt
	src/zm_monitor.cpp
 2014-11-28 14:23:05 -05: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
Andrew Bauer 9163536219 Merge pull request #358 from knnniggett/prevbutton 
Fix prev button while in gapless mode.  All buttons tested and working.
 2014-07-04 10:33:05 -05:00
Kfir Itzhak 5217bb668a Merge remote branch 'origin/master' into video 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
 2014-06-06 09:25:05 +03:00
stevegilvarry 33090f2264 Merge branch 'master' into feature-h264-videostorage 
Conflicts:
	configure.ac
	src/zm_config_defines.h
	src/zm_ffmpeg.h
	web/index.php
 2014-05-30 01:55:24 +10:00
Isaac Connor 00aad4a128 frame_count should be an integer so don't use NULL 2014-05-05 13:06:58 -04:00
Isaac Connor a8929914bb add a NULL test for frame_coutn before calling atoi. 2014-05-05 11:29:09 -04:00
Kfir Itzhak 0d7c52dc1f Merge remote branch 'origin/master' into video 
Conflicts:
	src/CMakeLists.txt
	src/zm_monitor.cpp
 2014-04-17 13:26:00 +03:00
Andrew Bauer b126ca3e01 modify play button 2014-03-30 11:18:14 -05:00
Andrew Bauer 3f7f398210 rework prev and next buttons 2014-03-28 17:18:34 -05:00
Andrew Bauer 264b98548f Fix prev button while in gapless mode. All buttons tested and working. 2014-03-25 17:12:26 -05:00
Andrew Bauer d2be7d4cd8 Update zm_event.cpp 
Commit 79af2adaa0 attempted to fix the Prev button when in Gapless Mode, but it caused issues when rewinding. Rolling back.
 2014-03-25 07:01:40 -05:00
Kfir Itzhak 2b79ff2cbd Initial commit for saving events as videos :) 2013-12-19 18:38:07 +02:00
David Nesting 79c7a1b255 Apply INSERTs in Event::AddFrames in batches to avoid excessive query length 2013-10-26 18:41:12 -07:00
Andrew Bauer 79af2adaa0 When loading a new event, always set the current frame id to the first frame rather than the last 2013-10-09 07:32:27 -05:00
mastertheknife a9e886aea2 Fix small zipped images bug introduced by commit e12a9dc408 2013-10-06 06:35:56 +03:00
mastertheknife e12a9dc408 Fixed compilation failure when zlib is not available 2013-10-04 23:20:39 +03:00
Chris Wiggins 9c168a9af5 Check if videoing for bulk frame adding too 2013-09-29 10:10:16 +13:00
Chris Wiggins 35468a5b9c Tidy up starting and stopping of recording 2013-09-28 23:22:58 +12:00
Chris Wiggins 938f81c753 Add snapshot.jpg to event directory if we are doing a video recording 2013-09-28 23:17:22 +12:00
Chris Wiggins 65afc830b1 Save a snapshot image alongside the h264 video for thumbnail and poster use 2013-09-28 18:50:54 +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
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00