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

1294 Commits

Author SHA1 Message Date
SteveGilvarry 1c479a01f2 Fix PRId64 issue in travis, another try 2015-11-05 00:34:48 +11:00
SteveGilvarry 078dc85548 Fix PRId64 issue in travis, builds locally fine, but I can see a gcc version issue here 2015-11-04 22:52:47 +11: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
SteveGilvarry 5ba13f1a76 ffmpeg 2.9 patched removed SSE2 CPU flags as these are automatically detected 
for all ffmpeg versions circa 2010. This commit removes the if statement on
duplicated functions.
 2015-11-04 16:24:39 +11:00
SteveGilvarry 51914994f7 Migrating from av_free/av_freep to av_frame_free using libavcodec version 
check. Also replaced recently deprecated av_free_packet with av_packet_unref.
 2015-11-04 15:30:14 +11:00
SteveGilvarry bc5ef6c599 Handle PixelFormat to AVPixelFormat change using _AVPIXELFORMAT and version 
check to define correctly. Also at same time define all AV_PIX_FMT_* to
PIX_FMT_*
 2015-11-04 12:46:26 +11:00
Dmitry Smirnov 0ff7a4e616 Replace deprecated FFmpeg API 
Fixes FTBFS with ffmpeg-2.9; compatible with ffmpeg-2.8.

Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803850
 2015-11-03 11:58:23 +11:00
Heng Liu 17e65d12b4 fixed SaveJPEGs are not working 
which is caused in errors introduced when merging with master
 2015-10-31 21:27:23 -07:00
Isaac Connor 44168ce05e Merge branch 'master' into multi-server 2015-10-30 11:29:03 -04:00
SteveGilvarry 650d93435e Remove syslog.h 2015-10-30 21:42:58 +11:00
inflex 6e2e33cf89 Fixes problem of crashing zmc when bad packet arrives causing av_interleaved_write_frame() to return non-zero (-22). Prefilters common packet issues. Add metadata title to generated video file 2015-10-30 19:05:40 +10:00
SteveGilvarry d45cf9607b Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2015-10-28 08:12:46 +11:00
baffo32 44cda8032b Install nph-zms with FILES so that it is listed in install_manifest.txt and uninstalled with make uninstall 2015-10-24 20:07:42 -04: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
Isaac Connor 582cbe7567 Merge branch 'master' into multi-server 2015-10-15 09:01:19 -04:00
Isaac Connor ac8bfc71dc fix specifying ServerId 2015-10-02 18:22:48 +00:00
Isaac Connor 6ff4e333b4 Merge branch 'fix_warnings' into multi-server 
Conflicts:
	src/zm_monitor.cpp
 2015-10-02 15:34:05 +00:00
Isaac Connor 7b253bcd7e Debug line 2015-10-02 15:28:51 +00:00
Isaac Connor 24b79e81bc add include for basename on freebsd 2015-10-02 11:00:42 -04:00
Isaac Connor 8125ef0334 change types and move things around to remove compile warnings 2015-10-02 09:49:09 -04:00
Isaac Connor e4b0e74f69 merge master 2015-09-24 10:01:27 -04:00
Dmitry Smirnov 333e7ec67b header typo corrections 2015-09-19 17:39:54 +10:00
Andrew Bauer 4a978034ad Merge pull request #1056 from ZoneMinder/fix_privacy_mask_segfaults 
Fix sgfault caused by the privacy mask stuff
 2015-09-16 10:46:45 -05:00
Isaac Connor b8f2b1e0a0 Merge branch 'mmap_fd_gt_3' into multi-server 2015-09-16 11:01:06 -04:00
Isaac Connor d991912ce4 Merge branch 'fix_privacy_mask_segfaults' into multi-server 2015-09-16 11:00:57 -04:00
Isaac Connor e70d49b033 Merge branch 'fix_privacy_mask_segfaults' into mmap_fd_gt_3 2015-09-16 10:58:57 -04:00
Isaac Connor 6e12febf3d initialize privacy_bitmask and check it before deletep[] to prevent segfault 2015-09-16 10:51:27 -04:00
Isaac Connor 0571ca3025 quick fix for #1055: make sure our mmap fd is > 2 2015-09-16 09:11:22 -04:00
Isaac Connor bb41ebf776 Merge branch 'master' into multi-server 
Conflicts:
	src/zm_monitor.cpp
 2015-08-31 16:03:40 -04:00
Andy Bauer 395e628541 Merge branch 'new_rtsp_describe' of https://github.com/knnniggett/ZoneMinder into knnniggett-new_rtsp_describe 
Conflicts:
	CMakeLists.txt
	configure.ac
	version
 2015-08-29 07:57:18 -05:00
Isaac Connor 09e5463a81 test for value in server_id before atoi 2015-08-27 11:16:58 -04:00
Isaac Connor bca9a19488 tabs to spaces 2015-08-27 11:14:00 -04:00
Isaac Connor 75919c9cd5 Merge branch 'master' into multi-server 
Conflicts:
	docs/installationguide/ubuntu.rst
	misc/apache.conf.in
	src/zm_monitor.cpp
 2015-08-27 10:34:47 -04:00
Isaac Connor 1cf54d2e38 Merge pull request #1026 from schrorg/blacken-zones 
Add new zone type - privacy zones
 2015-08-27 09:14:16 -04:00
Robin Daermann d1343df920 Change colour of privacy zones from black to dark grey 2015-08-26 07:45:45 +02:00
Robin Daermann 2aca87654a Remove unneccessary parameter in constructor 2015-08-26 07:44:50 +02:00
Andrew Bauer 14feffc455 strip the path from the filename 2015-08-21 18:28:50 -05:00
Andrew Bauer 22dc049bf4 remove Info statement used for testing 2015-08-21 10:34:23 -05:00
Andrew Bauer a2d7ac86fe add rtsp_describe to RtspThread class 2015-08-21 10:29:54 -05:00
Robin Daermann 5b465194f8 Renamed 'Blacken' zone type to 'Privacy' 2015-08-20 17:37:59 +02:00
Robin Daermann acacd247c8 Really blacken all pixel colours 2015-08-20 17:17:58 +02:00
Robin Daermann fc50b38331 collect variable name 2015-08-20 16:02:29 +02:00
Robin Daermann 52be185fc9 Support blacken zones in all colour depths 2015-08-20 15:58:13 +02:00
Robin Daermann 6fc4525784 Blacken Zones are now correctly displayed 2015-08-20 15:01:07 +02:00
Robin Daermann 8f9ed96585 First try to implement blacken areas for monitors 2015-08-20 14:20:41 +02:00
Isaac Connor 41637278c9 merge master 2015-08-19 16:08:12 -04:00
Isaac Connor 12da43afe7 Merge branch 'master' into multi-server 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
 2015-08-19 14:01:28 -04:00
Isaac Connor 880e77b096 Merge branch 'master' into multi-server 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
 2015-08-19 13:30:48 -04:00
Andrew Bauer fe3595bfa1 Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval 
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_update-1.28.101.sql
	src/zm_monitor.cpp
	src/zm_monitor.h
	version
 2015-08-18 20:20:53 -05:00
Andrew Bauer 2600b96f1b fix merge conflict in zm_monitor.cpp 2015-08-18 14:19:46 -05:00
Andrew Bauer 68adcc9e67 Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp 
Conflicts:
	CMakeLists.txt
	configure.ac
	src/zm_monitor.cpp
	src/zm_monitor.h
	version
 2015-08-18 14:07:38 -05: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
Robin Daermann 299c629a20 Merge remote-tracking branch 'upstream/master' into large-timestamp 
Conflicts:
	CMakeLists.txt
	configure.ac
	version
 2015-08-17 13:42:36 +02:00
Andrew Bauer 59c1b83d4f create embed_exif flag in Monitor class 2015-08-16 17:42:12 -05:00
Isaac Connor c0517b11ae Merge branch 'master' into multi-server 2015-08-16 10:52:51 -04: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
Robin Daermann 3368d4f474 Removed untranslated "Font size" from language files, corrected white 
space and make font size a const int
 2015-08-10 15:35:19 +02:00
Robin Daermann 7f3a07f21b Add label size to monitor options (database and backend part) 
This commit bumps version to 1.28.101 because of database schema change
 2015-08-10 15:35:18 +02:00
Linwood-F 6aca6c8d26 Demote user auth info message to debug 2015-08-09 12:16:01 -04:00
Robin Daermann 5a0d0ca5a3 Made large font selectable by a constant 2015-08-06 17:42:52 +02:00
Robin Daermann c733fec476 First (working) steps for adding large timestamp to images 2015-08-06 14:43:10 +02:00
Isaac Connor d9ee08a27b Merge pull request #983 from Linwood-F/982-demote-terminating-logger-msg-to-debug 
Change from info to debug
 2015-08-04 10:12:08 -04:00
Isaac Connor a36bee3767 Merge pull request #984 from Linwood-F/507-shared-data-for-purpose-query-warning 
Remove shared data warning for purpose query only
 2015-08-04 10:09:59 -04:00
Linwood-F 546b0dd353 Remove shared data warning for purpose query only 2015-08-03 20:37:17 -04:00
Linwood-F 2538514d18 Change from info to debug 2015-08-03 18:39:14 -04:00
Isaac Connor 46b9bd5d1c change the captured image size to camera image size check to be a > instead of !=. As long as we have enough buffer space, it doesn't matter if the captured image is smaller than what we defined. 2015-07-31 10:29:53 -04:00
Emmanuel Papin f7cfa1ecd4 Fix analysis sample rate calculation 2015-07-28 23:07:02 +02:00
SteveGilvarry 4dc0028e11 Clean up videostore code and remove lots of unused code 2015-07-28 21:41:10 +10:00
Isaac Connor 1e60fccd81 Cherry-Pick from iconnor - make it compile on ubuntu 15.04. Which is libav 56.1.0 
Conflicts:
	src/zm_ffmpeg.cpp
	src/zm_remote_camera_rtsp.cpp

Conflicts:
	distros/ubuntu1204/changelog
 2015-07-28 21:39:47 +10:00
SteveGilvarry f09a551d6a Merge branch 'master' into feature-h264-videostorage 2015-07-28 21:06:52 +10:00
Emmanuel Papin 93990b253f Use a dedicated pre event buffer if analysis_fps is set 2015-07-27 16:24:32 +02:00
Emmanuel Papin 18758826c7 Do not call time() function when it is not necessary 2015-07-25 13:46:11 +02:00
Emmanuel Papin 0bff99f5c7 Improve string conversion and use unsigned type for analysis_update_delay 2015-07-25 13:38:50 +02:00
Isaac Connor 3e5f6c65d3 Fix to scale, moving the +1's into the buffer allocation instead of calculation of new_width and new_height 2015-07-24 13:30:58 -04:00
Linwood-F 965425c395 Remove extraneous file 2015-07-23 19:37:23 -04:00
Linwood-F 72a92ee9d5 Add exif to jpg images saved 2015-07-23 19:34:39 -04:00
Emmanuel Papin 9e16c8a066 Improve log message and logic in UpdateAdaptiveSkip() 2015-07-24 01:01:51 +02:00
Emmanuel Papin 3b2378c21d Add a new warning in GetAnalysisRate function 2015-07-24 00:26:53 +02:00
Emmanuel Papin 649a39b372 Replace analysis interval parameter by analysis framerate 2015-07-23 16:36:30 -04:00
Emmanuel Papin 132e0a1798 Add analysis fps paramter to monitors 2015-07-22 21:38:35 +02:00
Emmanuel Papin a6b7c6e99f Add analysis interval parameter to monitors 2015-07-21 22:52:52 +02:00
Isaac Connor 9f1d91b655 Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server 2015-07-20 16:28:59 -04:00
Isaac Connor dfd3d2c4cd use std::string to build sql for loading monitors. ALso use new ZmDbFetch functions 2015-07-20 16:28:21 -04:00
Isaac Connor 633a6e2df9 use zmDbFetchOne more 2015-07-16 16:53:30 -04:00
Isaac Connor 60410c98d6 use new db functions in zm_config.cpp 2015-07-16 16:44:09 -04:00
Isaac Connor 5a363273a2 Merge branch 'master' into multi-server 
Conflicts:
	distros/ubuntu1504/changelog
 2015-07-16 16:37:44 -04:00
Isaac Connor 48fa0c3d42 add some utility db functions 2015-07-16 13:04:28 -04:00
Isaac Connor 4ed248e5a5 Add SERVER_NAME and SERVER_ID loading to config 2015-07-16 10:05:21 -04:00
Isaac Connor 50b333fb28 Add SERVER_NAME and SERVER_ID loading to config 2015-07-16 10:04:56 -04:00
Isaac Connor 3481368574 given SERVER_NAME populate SERVER_ID and vice versa 2015-07-15 16:44:16 -04:00
Andrew Bauer a9035221cb Merge pull request #934 from ZoneMinder/fix_utf 
fix utf8 ' characters
 2015-07-15 10:30:28 -05:00
Isaac Connor 33a9fc6175 fix utf8 ' characters 2015-07-15 10:37:08 -04:00
Isaac Connor 602f703df8 roudn up when calculating buffer size for scaled image. Fixes #932 2015-07-15 10:22:57 -04:00