24e3306955
master master
2016-04-28 09:20:56 -04:00
af361042ef
Merge pull request #1446 from ZoneMinder/stdstring_instead_of_c_string
...
use std::string instead of C strings. Mostly this will quiet build wa…
2016-04-28 22:13:44 +10:00
d9fd0faa32
Merge pull request #1447 from ZoneMinder/simplify_zm_signal
...
Simplify zm signal
2016-04-28 21:37:55 +10:00
69d5065ebf
move ip down as well
2016-04-26 16:05:37 -04:00
5d88acb8a6
re-arrange a few lines to remove some duplicate ifdef's. And move the cr2 def into the area that uses it to remove build warnings on freebsd
2016-04-26 16:03:26 -04:00
7d7249f328
use std::string instead of C strings. Mostly this will quiet build warnings on FreeBSD and removes the potential for buffer overflows
2016-04-26 15:48:21 -04:00
9aff84fbbb
unbreak build under FreeBSD 32 bit II
2016-04-26 21:53:50 +03:00
2d8c484792
rotate dimensions when instantiating the Monitor object
2016-04-25 16:48:26 -04:00
8c53925fdc
redo rotation fix. cameras have to be given the width and height that the camera will be sending. The monitor will report rotated dimensions.
2016-04-25 16:00:34 -04:00
26a45d5fa9
Don't rotate dimensions when constructing the monitor because they are already rotated
2016-04-25 13:55:28 -04:00
4ca61b7bd8
Removed 180 lines of commented out code that has been hanging around
...
in here for a long time.
2016-04-25 22:12:49 +10:00
e4f116af2f
more debug and comments, return checking
2016-04-15 15:32:48 -04:00
b3e68ca2f7
Must init videoStore in constuctor
2016-04-15 15:10:26 -04:00
c189e60d9b
add some comments, and dump filename and AVFormatContext on failure to write header
2016-04-14 12:34:52 -04:00
28b30ecb47
Merge pull request #1377 from ZoneMinder/random_fixes
...
Random fixes
2016-04-11 12:04:05 -05:00
fefa2dc804
add a test and error message if the codec is not h264
2016-04-06 12:48:16 -04:00
d83ab4d46c
Steal some packet dumping routines from ffmpeg. Convert them to use our logging routines
2016-04-06 11:25:05 -04:00
2f1376950a
spelling fix
2016-04-06 10:50:12 -04:00
9aeba8ced8
whitespace fixes
2016-04-06 10:50:00 -04:00
0ef02287dd
revert
2016-04-06 10:49:42 -04:00
222f7755fe
fix whitespace
2016-04-06 10:27:41 -04:00
9a795432cf
merge all the commits from the messed up iconnor_video branch
2016-04-05 17:14:46 -04:00
4d7ded5ef0
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
configure.ac
src/Makefile.am
web/js/Makefile.am
2016-04-05 22:06:14 +10:00
4e9a925933
Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete
2016-04-04 20:52:49 -05:00
7ff8d36598
Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation
2016-04-04 20:44:53 -05:00
03b1ced568
tabs to spaces and use 2space indenting
2016-04-04 10:11:48 -04:00
abcf48b65c
Merge branch 'master' into feature-h264-videostorage
2016-04-01 08:53:45 -04:00
ecce87b779
mamke status a member so that we aren't return the address of a local variable
2016-03-31 14:43:22 -04:00
a16c1746e5
separate a failure to open versus failure to lock. Quiets coverity because close can't handle a negative value
2016-03-24 10:00:02 -04:00
1e52a8ad2c
remove unused class member
2016-03-24 09:44:34 -04:00
b6ee4e4228
move return up into #ifdef.
2016-03-24 09:43:15 -04:00
0c32ae61ef
Merge branch 'master' into fix_coverity_issues
2016-03-24 09:42:01 -04:00
bfd846bbff
Add more logging to diagnose problems with applying ffmpeg options
2016-03-20 21:44:58 +00:00
5f4441878e
Coded_Frame deprecation all examples were no lomger setting AV_PKT_FLAG_KEY, is it on the packet already.
2016-03-03 17:16:06 +11:00
2122d6e443
Fix all the av_picture related deprecations
2016-03-03 01:03:55 +11:00
3ce620eb89
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-02-27 19:46:56 +11:00
23d437ab47
ffmpeg 3.0 API build failure fixes
2016-02-27 02:12:22 +11:00
e70d037895
Start avpicture deprecation
2016-02-27 01:23:20 +11:00
0277a66700
Remove eyezm from distros and Cmake.
...
Conflicts:
distros/debian8/control
2016-02-26 22:41:27 +11:00
4837585601
Deleted eyezm options documentation and references to it in other areas of documentation. Removed zmstreamer.cpp.
...
Conflicts:
src/zmstreamer.cpp
2016-02-26 22:37:23 +11:00
5ff427d9e9
Removed Autotools Makefile.am
...
Conflicts:
Makefile.am
misc/Makefile.am
src/Makefile.am
web/includes/Makefile.am
web/js/Makefile.am
web/skins/classic/css/classic/views/Makefile.am
web/skins/classic/css/flat/views/Makefile.am
web/skins/classic/views/Makefile.am
web/skins/classic/views/js/Makefile.am
2016-02-26 22:19:02 +11:00
5b047dc74b
zm_event: fix overlap in memcpy buffers
2016-02-20 23:58:36 +02:00
6f221ed269
Merge pull request #1278 from schrorg/bigfont-license
...
Added script to generate src/zm_bigfont.h
2016-02-16 09:17:54 -05:00
6332f28c53
zm_monitor: fix overlap in memcpy buffers
...
behavior undefined by POSIX and causes a crash with FORTIFY_SOURCE
2016-02-16 11:47:49 +02:00
e8c38dd016
demoted to debug due to lots of logs
2016-02-11 15:12:21 -05:00
f5ef721ebd
Add IP6 address type to valid types for ConnInfo
2016-02-10 17:53:00 +01:00
226b77bb63
Added script to generate src/zm_bigfont.h
...
Also added a line to the header of src/zm_bigfont.h on how it is
generated.
2016-02-10 11:28:56 +01:00
5bcc414038
codespell: misc. spelling corrections
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 20:41:36 +11:00
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
904f584fcb
CMD_QUIT definition
2016-01-29 10:00:02 -05:00
38bca6b95d
added CMD_QUIT to kill zms via command
2016-01-29 09:58:57 -05:00
47b2cdbb96
added CMD_QUIT to kill zms via command
2016-01-29 09:58:50 -05:00
f275498790
Add Debug for sql used to load other than local monitors
2016-01-26 21:00:32 -05:00
902065a6c1
Add Debug for sql used to load local monitors
2016-01-26 20:59:07 -05:00
3a0b28f168
Add Debug/Info lines reporting multi-server status
2016-01-26 20:53:34 -05:00
3a18a62bc6
Add ServerId column when inserting log line into database
2015-12-30 08:29:45 -05:00
f357ea6ccd
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-12-28 11:53:04 -05:00
ccded54937
put back missing col++
2015-12-28 11:52:40 -05:00
3f1c782ff7
Fix random extra semicolon
2015-12-28 16:29:04 +11:00
e76cc59bad
revert whitespace changes
2015-12-21 13:42:44 -05:00
36f83aa412
revert whitespace changes
2015-12-21 13:35:17 -05:00
609ab79f81
revert whitespace changes
2015-12-21 13:32:57 -05:00
1fee421500
revert whitespace changes
2015-12-21 13:29:41 -05:00
c0a79567e6
revert whitespace changes
2015-12-21 13:26:24 -05:00
fdf1912ec1
revert whitespace changes
2015-12-21 13:11:18 -05:00
dfd7986c01
Merge branch 'master' into multi-server
...
Conflicts:
distros/debian_cmake/links
distros/ubuntu1504_cmake/zoneminder.postinst
2015-12-21 12:57:45 -05:00
af9fc1de90
revert white space changes.
2015-12-21 12:57:05 -05:00
e28e3c2b75
Merge branch 'master' into feature-h264-videostorage
2015-12-20 14:13:30 +11:00
af76d19646
Add a constrained namespace implementation around Authenticator class to prevent conflict with libvlc live555.
2015-12-18 01:47:10 +11:00
688ee7f103
Merge branch 'zms_socket_lock' into multi-server
2015-12-04 16:41:26 -05:00
0fc68e2e91
delete lock when we are done with it
2015-12-04 16:38:24 -05:00
be36301779
use exclusive lock, add includes
2015-12-04 16:35:27 -05:00
6d605362fc
Merge branch 'zms_socket_lock' into multi-server
2015-12-04 15:39:51 -05:00
e637915823
add a lock around the socket creating/deleting.
2015-12-04 15:39:37 -05:00
220ee5e516
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-11-29 13:17:22 +11:00
f7cc2fb44f
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-11-23 10:42:14 -05:00
a9609d2a43
fix mem alloc fault in zm_monitor.cpp
2015-11-21 12:17:23 -06:00
4d6c4355db
Merge branch 'master' into multi-server
2015-11-20 16:07:50 -05:00
6002f251c0
Add FFMPEGInit back
2015-11-05 19:36:11 +11:00
477e63a878
Reorder RTSPDescribe to avoid -wreorder warnings
2015-11-05 17:19:58 +11:00
44f63443c1
video branch ffmpeg 2.9 fixes
...
ffmpeg 2.9 patched removed SSE2 CPU
2015-11-04 14:43:45 -08:00
4e263f5913
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
src/zm_ffmpeg.h
2015-11-04 14:39:52 -08:00
4c773472bd
Add support for IPv6 in RTSP code
...
Monitors with source type 'remote' can now be accessed over IPv6. This
code uses getaddrinfo(3) now instead of gethostbyname(3) - and changes a
lot of networking stuff which should be tested thoroughly.
2015-11-04 16:41:47 +01:00
5423be9eb8
Revert space removal around PRId64
2015-11-05 01:25:44 +11:00
5b68656602
Try "STDC_FORMAT_MACROS" to see if that helps Travis on gcc 4.6.3
2015-11-05 01:09:39 +11:00
1c479a01f2
Fix PRId64 issue in travis, another try
2015-11-05 00:34:48 +11:00
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
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
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
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
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
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
17e65d12b4
fixed SaveJPEGs are not working
...
which is caused in errors introduced when merging with master
2015-10-31 21:27:23 -07:00
44168ce05e
Merge branch 'master' into multi-server
2015-10-30 11:29:03 -04:00
650d93435e
Remove syslog.h
2015-10-30 21:42:58 +11:00
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
d45cf9607b
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-10-28 08:12:46 +11:00
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
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
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
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
582cbe7567
Merge branch 'master' into multi-server
2015-10-15 09:01:19 -04:00
ac8bfc71dc
fix specifying ServerId
2015-10-02 18:22:48 +00:00
6ff4e333b4
Merge branch 'fix_warnings' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-10-02 15:34:05 +00:00
7b253bcd7e
Debug line
2015-10-02 15:28:51 +00:00
24b79e81bc
add include for basename on freebsd
2015-10-02 11:00:42 -04:00
8125ef0334
change types and move things around to remove compile warnings
2015-10-02 09:49:09 -04:00
e4b0e74f69
merge master
2015-09-24 10:01:27 -04:00
333e7ec67b
header typo corrections
2015-09-19 17:39:54 +10:00
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
b8f2b1e0a0
Merge branch 'mmap_fd_gt_3' into multi-server
2015-09-16 11:01:06 -04:00
d991912ce4
Merge branch 'fix_privacy_mask_segfaults' into multi-server
2015-09-16 11:00:57 -04:00
e70d49b033
Merge branch 'fix_privacy_mask_segfaults' into mmap_fd_gt_3
2015-09-16 10:58:57 -04:00
6e12febf3d
initialize privacy_bitmask and check it before deletep[] to prevent segfault
2015-09-16 10:51:27 -04:00
0571ca3025
quick fix for #1055 : make sure our mmap fd is > 2
2015-09-16 09:11:22 -04:00
bb41ebf776
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-08-31 16:03:40 -04:00
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
09e5463a81
test for value in server_id before atoi
2015-08-27 11:16:58 -04:00
bca9a19488
tabs to spaces
2015-08-27 11:14:00 -04:00
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
1cf54d2e38
Merge pull request #1026 from schrorg/blacken-zones
...
Add new zone type - privacy zones
2015-08-27 09:14:16 -04:00
d1343df920
Change colour of privacy zones from black to dark grey
2015-08-26 07:45:45 +02:00
2aca87654a
Remove unneccessary parameter in constructor
2015-08-26 07:44:50 +02:00
14feffc455
strip the path from the filename
2015-08-21 18:28:50 -05:00
22dc049bf4
remove Info statement used for testing
2015-08-21 10:34:23 -05:00
a2d7ac86fe
add rtsp_describe to RtspThread class
2015-08-21 10:29:54 -05:00
5b465194f8
Renamed 'Blacken' zone type to 'Privacy'
2015-08-20 17:37:59 +02:00
acacd247c8
Really blacken all pixel colours
2015-08-20 17:17:58 +02:00
fc50b38331
collect variable name
2015-08-20 16:02:29 +02:00
52be185fc9
Support blacken zones in all colour depths
2015-08-20 15:58:13 +02:00
6fc4525784
Blacken Zones are now correctly displayed
2015-08-20 15:01:07 +02:00
8f9ed96585
First try to implement blacken areas for monitors
2015-08-20 14:20:41 +02:00
41637278c9
merge master
2015-08-19 16:08:12 -04:00
12da43afe7
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 14:01:28 -04:00
880e77b096
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 13:30:48 -04:00
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
2600b96f1b
fix merge conflict in zm_monitor.cpp
2015-08-18 14:19:46 -05:00
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
987db68452
Fix extra image copy; fix options unset of exif toggle
2015-08-18 14:39:55 -04:00
99c8af4a17
Bring up to date with master (mostly)
2015-08-17 22:52:51 -04:00
3b9bb6053c
Add clarifying comment
2015-08-17 22:10:39 -04:00
9351e1b9d9
Incorporate exif switch
2015-08-17 22:07:41 -04:00
299c629a20
Merge remote-tracking branch 'upstream/master' into large-timestamp
...
Conflicts:
CMakeLists.txt
configure.ac
version
2015-08-17 13:42:36 +02:00
59c1b83d4f
create embed_exif flag in Monitor class
2015-08-16 17:42:12 -05:00
c0517b11ae
Merge branch 'master' into multi-server
2015-08-16 10:52:51 -04:00
89e13c1cc0
leave 1 char at end for \0
2015-08-14 16:10:44 -04:00
5b0288e5f5
use frame_type instead of score in conditional
2015-08-14 07:03:08 -05:00
19174adfa1
add frame_type to debug message
2015-08-13 20:47:14 -05:00
14dabb095c
set scroe to zero if less than zero
2015-08-13 18:06:20 -05:00
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
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
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
6aca6c8d26
Demote user auth info message to debug
2015-08-09 12:16:01 -04:00
5a0d0ca5a3
Made large font selectable by a constant
2015-08-06 17:42:52 +02:00
c733fec476
First (working) steps for adding large timestamp to images
2015-08-06 14:43:10 +02:00
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
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
546b0dd353
Remove shared data warning for purpose query only
2015-08-03 20:37:17 -04:00
2538514d18
Change from info to debug
2015-08-03 18:39:14 -04:00
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
f7cfa1ecd4
Fix analysis sample rate calculation
2015-07-28 23:07:02 +02:00
4dc0028e11
Clean up videostore code and remove lots of unused code
2015-07-28 21:41:10 +10:00
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
f09a551d6a
Merge branch 'master' into feature-h264-videostorage
2015-07-28 21:06:52 +10:00
93990b253f
Use a dedicated pre event buffer if analysis_fps is set
2015-07-27 16:24:32 +02:00
18758826c7
Do not call time() function when it is not necessary
2015-07-25 13:46:11 +02:00
0bff99f5c7
Improve string conversion and use unsigned type for analysis_update_delay
2015-07-25 13:38:50 +02:00
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
965425c395
Remove extraneous file
2015-07-23 19:37:23 -04:00
72a92ee9d5
Add exif to jpg images saved
2015-07-23 19:34:39 -04:00
9e16c8a066
Improve log message and logic in UpdateAdaptiveSkip()
2015-07-24 01:01:51 +02:00
3b2378c21d
Add a new warning in GetAnalysisRate function
2015-07-24 00:26:53 +02:00
649a39b372
Replace analysis interval parameter by analysis framerate
2015-07-23 16:36:30 -04:00
132e0a1798
Add analysis fps paramter to monitors
2015-07-22 21:38:35 +02:00
a6b7c6e99f
Add analysis interval parameter to monitors
2015-07-21 22:52:52 +02:00
9f1d91b655
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-07-20 16:28:59 -04:00
dfd3d2c4cd
use std::string to build sql for loading monitors. ALso use new ZmDbFetch functions
2015-07-20 16:28:21 -04:00
633a6e2df9
use zmDbFetchOne more
2015-07-16 16:53:30 -04:00
60410c98d6
use new db functions in zm_config.cpp
2015-07-16 16:44:09 -04:00
5a363273a2
Merge branch 'master' into multi-server
...
Conflicts:
distros/ubuntu1504/changelog
2015-07-16 16:37:44 -04:00
48fa0c3d42
add some utility db functions
2015-07-16 13:04:28 -04:00
4ed248e5a5
Add SERVER_NAME and SERVER_ID loading to config
2015-07-16 10:05:21 -04:00
50b333fb28
Add SERVER_NAME and SERVER_ID loading to config
2015-07-16 10:04:56 -04:00
3481368574
given SERVER_NAME populate SERVER_ID and vice versa
2015-07-15 16:44:16 -04:00
a9035221cb
Merge pull request #934 from ZoneMinder/fix_utf
...
fix utf8 ' characters
2015-07-15 10:30:28 -05:00
33a9fc6175
fix utf8 ' characters
2015-07-15 10:37:08 -04:00
602f703df8
roudn up when calculating buffer size for scaled image. Fixes #932
2015-07-15 10:22:57 -04:00
bce968ebd8
Merge pull request #923 from ZoneMinder/zm_buffer_improvements
...
Introduce a read_into function in the Buffer.
2015-07-13 18:51:38 -05:00
8b2f67c456
don't include .cpp in man
2015-07-13 11:30:32 -04:00
561bf43721
fix pod2man generation for out-of-source builds
2015-07-09 19:33:06 -05:00
994de4ae0a
Introduce a read_into function in the Buffer. Use it when reading over http from a camera to remove an extra mem copy. Limit reads to 1 network buffer instead of reading everything that is available.
2015-07-06 15:57:06 -04:00
39d152656a
Merge pull request #920 from ZoneMinder/zms_no_crash
...
Zms no crash
2015-07-04 06:58:32 +10:00
58448adb51
Merge pull request #896 from knnniggett/pod2man
...
Generate man pages for perl scripts & C Binaries in the bin folder
2015-07-03 11:40:24 -04:00
3c5a9b796b
Merge branch 'master' into zms_no_crash
2015-07-03 11:34:42 -04:00
956e2936a3
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-06-25 16:26:49 -04:00
2030b5e6ef
Merge pull request #870 from ZoneMinder/better_http_reading
...
alter the logic of ReadData. New behaviour is documented.
2015-06-23 08:16:44 -05:00
c3fa7ea940
Merge pull request #867 from ZoneMinder/analysis_image_optimisation
...
analysis optimisations
2015-06-23 08:13:34 -05:00
ec6c6b3ace
typo fix
2015-06-22 09:26:17 -04:00
fa835359a1
Add install target for C binary man pages
2015-06-20 17:33:13 -05:00
4deb0d53c8
Add pod documentation to C binaries
2015-06-20 17:11:20 -05:00
846bea2aa6
Merge pull request #866 from ZoneMinder/no_death_on_db_disconnect_in_logger
...
Don't die if db goes away during logging
2015-06-11 15:17:50 +02:00
249b9e2952
Merge pull request #875 from ZoneMinder/add_version_to_startup_log
...
Add version to the startup log line
2015-06-11 15:12:00 +02:00
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
c391325457
Merge pull request #858 from manupap1/fix_avcodec_warnings
...
Fix detection of deprecated libav / ffmpeg functions
2015-06-08 10:26:35 -04:00
a534e66437
Add version to the startup log line
2015-06-08 10:24:40 -04:00
95d7a3ff94
alter the logic of ReadData. New behaviour is documented. This solves unneccessary disconnects for me.
2015-06-04 11:33:03 -04:00
0308baabb3
This change uses a member Image instead of constantly allocation a new Image.
...
This saves all the initialisation and the lines of debug.
Also in GetImage we potentially remove and entire copy if no scaling or timestamping is being done.
2015-06-03 15:10:52 -04:00
b91d1c7b0c
Don't die if db goes away during logging
2015-06-03 14:57:19 -04:00
7811354d92
Move iostream inclusion in zm.h and declare explicitely the namespace for cout
2015-05-29 23:22:20 +02:00
818a5256e4
Readd checking of micro version in zm_mpeg.cpp to fix compilation issue
2015-05-29 19:23:00 +02:00
f6d69e02b5
Mention original source for check functions
2015-05-29 17:45:35 +02:00
a36b4aa65d
Implement version check for ffmpeg and libav (address issue #580 )
2015-05-29 17:38:02 +02:00
45b5fd3945
Merge pull request #801 from knnniggett/nph-zms
...
link zms to nph-zms, rather than build identical
2015-05-21 13:15:38 -04:00
12516da3dc
Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work
...
haven't attempted to build yet, there are some changes
2015-05-17 17:18:54 -07:00
5ded77f8de
Merge pull request #825 from rwg0/688-fix-fast-forward
...
Fix fast forward/reverse in event playback (#688 )
2015-05-09 19:39:23 -05:00
79398a2bec
Merge pull request #821 from onlyjob/PBP
...
beautifying *.pm
2015-05-08 08:56:01 -04:00
ea795c4040
Fix to compile on 32bit kFreeBSD
2015-04-24 13:55:10 -04:00
422020a3b2
Fix fast forward/reverse in event playback not being fast if effectivefps < maxfps
2015-04-22 22:11:33 +01:00
209f23cc6e
Fix build issues on kFreeBSD. Fixes #771
2015-04-20 12:53:02 -04:00
eddada011c
spelling corrections (thanks, /usr/bin/codespell)
2015-04-19 20:38:23 +10:00
d5e403b7e0
Merge pull request #775 from ZoneMinder/freebsd_fixes
...
Freebsd fixes
2015-04-17 15:21:42 -05:00
0c0a23bf86
Merge pull request #778 from onlyjob/build-hurd
...
build: add PATH_MAX definitions (needed on GNU Hurd)
2015-04-16 01:00:00 -04:00
0a2f1cd2b6
build: add PATH_MAX definitions (needed on GNU Hurd)
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-16 11:25:04 +10:00
fc64e3f01b
Merge pull request #772 from balr0g/linked-cameras-trigger-on-new-events
...
Don't trigger linked cameras on new events
2015-04-15 20:23:54 -05:00
e4cf323949
Merge pull request #800 from Sune1337/pthread_join
...
* use pthread_join instead of pthread_tryjoin_np
2015-04-12 11:51:50 -05:00
4cb8cf8681
remove commented commands
2015-04-12 11:48:49 -05:00
3a3f186e74
update working_directory
2015-04-12 11:48:18 -05:00
8f337999d4
remove nph-zms target
2015-04-12 11:47:28 -05:00
3108fd2109
link nph-zms rather than build
2015-04-12 11:00:43 -05:00
124ba1c2a8
Merge pull request #796 from ZoneMinder/zm_image_cleanups
...
one small fix for a log line where the 4th parameter wasn't included. T...
2015-04-10 12:38:35 -05:00
065a372678
one small fix for a log line where the 4th parameter wasn't included. The rest are very small optimisations.
2015-04-10 13:26:17 -04:00
5779b2e20f
* use pthread_join instead of pthread_tryjoin_np
2015-04-08 22:15:54 +02:00
549d7fd426
include libv4l1-videodev headers
2015-04-03 18:24:51 -05:00
e4e2160bf6
Don't trigger linked cameras on new events
2015-03-31 13:22:02 -04:00
21915eb92c
Merge branch 'master' into freebsd_fixes
2015-03-31 11:06:53 -04:00
6bbe42c5eb
build: fix FTBFS with format-hardening
...
~~~~
x86_64-linux-gnu-g++ -DHAVE_CONFIG_H -I. -I.. -I/usr/include -I/usr/include -I/usr/include -D__STDC_CONSTANT_MACROS -Wall -finline-functions -fomit-frame-pointer -I/usr/include -D__STDC_CONSTANT_MACROS -D_FORTIFY_SOURCE=2 -D__STDC_CONSTANT_MACROS -D__STDC_CONSTANT_MACROS -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DZM_FFMPEG_CVS -DHAVE_LIBCRYPTO -MT zm_mpeg.o -MD -MP -MF .deps/zm_mpeg.Tpo -c -o zm_mpeg.o zm_mpeg.cpp
zm_mpeg.cpp: In member function ‘void VideoStream::SetupFormat()’:
zm_mpeg.cpp:112:56: error: format not a string literal and no format arguments [-Werror=format-security]
snprintf( s->filename, sizeof(s->filename), filename );
^
zm_mpeg.cpp:112:56: error: format not a string literal and no format arguments [-Werror=format-security]
~~~~
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-03-30 15:27:37 +11:00
ed28eebba4
This is already included in zm_signal.h
2015-03-27 15:16:15 -04:00
0aa20ed6e8
Remove pict from writeAudioFramePacket as not used
2015-03-22 21:03:25 +11:00
b587222ce5
bring recent improvements in ffmpeg capture function into captureandrecord
2015-03-22 21:02:02 +11:00
b3313edde0
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
...
Conflicts:
web/skins/classic/views/event.php
2015-03-21 23:49:56 +11:00
2e10263b64
Improve logging to include monitor name and for shared cameras show 1/1 instead of 0/1
2015-03-04 16:34:31 -05:00
084e2a8b8f
when auth is needed, try command again before dying.
2015-03-02 10:47:52 -05:00
3c5b1fd07f
fix extra slash when adding trackurl to controlurl
2015-02-26 10:22:21 -05:00
c7dc157f4d
FreeBSD fix
2015-02-24 09:22:55 -05:00
52938920de
backtrace is in execinfo on FreeBSD
2015-02-24 09:22:39 -05:00
3cc4c2e24d
fixes to get pid on FreeBSD
2015-02-24 09:22:08 -05:00
0bea381510
sendfile tricks
2015-02-24 09:20:55 -05:00
4394bb0a9a
Make zms not crash when zmc is not running.
2015-02-22 16:58:15 -05:00
550d517701
sigh... fix the image to capture_image
2015-02-22 16:36:01 -05:00
2f3104aada
fix debug line
2015-02-22 16:29:36 -05:00
Isaac Connor
Steve Gilvarry
abi
Andrew Bauer
Jon Burgess
Kaarle Ritvanen
Isaac Connor
arjunrc
Robin Daermann
Dmitry Smirnov
Isaac Connor
SteveGilvarry
Andrew Bauer
Heng Liu
inflex
baffo32
Linwood-F
Emmanuel Papin
Rick Sayre
Isaac Connor
rwg0
Isaac Connor
Sune1337
balr0g