Isaac Connor
7496dc392f
get rid of use of separator, just use \n
2016-06-21 14:06:07 -04:00
Isaac Connor
dfc885a12a
fix tabs
2016-06-21 12:25:13 -04:00
Steve Gilvarry
d8f6cc952d
Fix missing } from merge that was preventing building.
2016-06-19 07:22:14 +10:00
Isaac Connor
08c8da3e8f
fix extra else and some whitespace
2016-06-17 11:37:20 -04:00
Isaac Connor
26bba58c56
Merge branch 'master' into feature-h264-videostorage
2016-06-17 11:09:47 -04:00
Isaac Connor
472973e975
connect needs a +1
2016-06-12 15:45:24 -04:00
Andrew Bauer
f289b84901
move VIDEO_MAX_FRAME up
2016-06-06 19:04:02 -05:00
Andy Bauer
06923d44ba
Set VIDEO_MAX_FRAME if it is not defined
2016-06-06 16:27:13 -05:00
Isaac Connor
2385575c56
fix +1 being outside bind()
2016-06-02 16:23:04 -04:00
Andy Bauer
d12b9dc16d
fix typo. needs }
2016-05-24 09:24:18 -05:00
Andy Bauer
6e82f2c9a9
add messages back with debug 3
2016-05-24 08:50:09 -05:00
Andrew Bauer
bc163b33fc
move multiserver message to once during startup only
2016-05-23 20:06:29 -05:00
josh4trunks
2ab79820a1
Add back changes
2016-05-22 08:08:12 -07:00
Isaac Connor
58d326681a
quick fix for gcc6
2016-05-17 09:17:19 -04:00
Isaac Connor
435a1f7a2e
remove duplicated locking code created by bind_fixes
2016-05-17 09:11:52 -04:00
Steve Gilvarry
413eced6df
Merge pull request #1450 from ZoneMinder/bind_fixes
...
add some error checking, but fix the call to bind
2016-05-10 08:00:10 +10:00
Isaac Connor
fd896acd50
Merge branch 'RTSP-IPv6' of https://github.com/schrorg/ZoneMinder into schrorg-RTSP-IPv6
2016-05-06 08:32:21 -04:00
Isaac Connor
341ebc7b45
Merge branch 'master' into bind_fixes
2016-05-02 12:39:55 -04:00
Steve Gilvarry
b9a6273f32
Fix dropped part of sql query.
2016-05-01 15:59:53 +10:00
Steve Gilvarry
da157f5a1a
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-04-30 22:27:10 +10:00
Steve Gilvarry
e73935a15b
Clean up extraneous avutil include
2016-04-29 21:29:07 +10:00
Steve Gilvarry
8452c4bce5
Fix tab to spaces merge issues
2016-04-29 21:27:28 +10:00
Isaac Connor
0dc2987b84
add some error checking, but fix the call to bind which really should have a +1 in it.
2016-04-28 16:32:50 -04:00
Isaac Connor
fac07cba6d
Merge branch 'master' into tabs_to_spaces
2016-04-28 09:31:40 -04:00
Isaac Connor
629f141734
Merge pull request #1441 from SteveGilvarry/remove_commented_code
...
Delete large commented out code segment
2016-04-28 09:30:43 -04:00
Isaac Connor
24e3306955
master master
2016-04-28 09:20:56 -04:00
Steve Gilvarry
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
Steve Gilvarry
d9fd0faa32
Merge pull request #1447 from ZoneMinder/simplify_zm_signal
...
Simplify zm signal
2016-04-28 21:37:55 +10:00
Isaac Connor
69d5065ebf
move ip down as well
2016-04-26 16:05:37 -04:00
Isaac Connor
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
Isaac Connor
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
abi
9aff84fbbb
unbreak build under FreeBSD 32 bit II
2016-04-26 21:53:50 +03:00
Isaac Connor
2d8c484792
rotate dimensions when instantiating the Monitor object
2016-04-25 16:48:26 -04:00
Isaac Connor
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
Isaac Connor
26a45d5fa9
Don't rotate dimensions when constructing the monitor because they are already rotated
2016-04-25 13:55:28 -04:00
Steve Gilvarry
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
Isaac Connor
e4f116af2f
more debug and comments, return checking
2016-04-15 15:32:48 -04:00
Isaac Connor
b3e68ca2f7
Must init videoStore in constuctor
2016-04-15 15:10:26 -04:00
Isaac Connor
c189e60d9b
add some comments, and dump filename and AVFormatContext on failure to write header
2016-04-14 12:34:52 -04:00
Andrew Bauer
28b30ecb47
Merge pull request #1377 from ZoneMinder/random_fixes
...
Random fixes
2016-04-11 12:04:05 -05:00
Isaac Connor
fefa2dc804
add a test and error message if the codec is not h264
2016-04-06 12:48:16 -04:00
Isaac Connor
d83ab4d46c
Steal some packet dumping routines from ffmpeg. Convert them to use our logging routines
2016-04-06 11:25:05 -04:00
Isaac Connor
2f1376950a
spelling fix
2016-04-06 10:50:12 -04:00
Isaac Connor
9aeba8ced8
whitespace fixes
2016-04-06 10:50:00 -04:00
Isaac Connor
0ef02287dd
revert
2016-04-06 10:49:42 -04:00
Isaac Connor
222f7755fe
fix whitespace
2016-04-06 10:27:41 -04:00
Isaac Connor
9a795432cf
merge all the commits from the messed up iconnor_video branch
2016-04-05 17:14:46 -04:00
SteveGilvarry
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
Andy Bauer
4e9a925933
Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete
2016-04-04 20:52:49 -05:00
Andy Bauer
7ff8d36598
Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation
2016-04-04 20:44:53 -05:00
Isaac Connor
03b1ced568
tabs to spaces and use 2space indenting
2016-04-04 10:11:48 -04:00
Isaac Connor
abcf48b65c
Merge branch 'master' into feature-h264-videostorage
2016-04-01 08:53:45 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
1e52a8ad2c
remove unused class member
2016-03-24 09:44:34 -04:00
Isaac Connor
b6ee4e4228
move return up into #ifdef.
2016-03-24 09:43:15 -04:00
Isaac Connor
0c32ae61ef
Merge branch 'master' into fix_coverity_issues
2016-03-24 09:42:01 -04:00
Jon Burgess
bfd846bbff
Add more logging to diagnose problems with applying ffmpeg options
2016-03-20 21:44:58 +00:00
SteveGilvarry
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
SteveGilvarry
2122d6e443
Fix all the av_picture related deprecations
2016-03-03 01:03:55 +11:00
SteveGilvarry
3ce620eb89
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-02-27 19:46:56 +11:00
SteveGilvarry
23d437ab47
ffmpeg 3.0 API build failure fixes
2016-02-27 02:12:22 +11:00
SteveGilvarry
e70d037895
Start avpicture deprecation
2016-02-27 01:23:20 +11:00
SteveGilvarry
0277a66700
Remove eyezm from distros and Cmake.
...
Conflicts:
distros/debian8/control
2016-02-26 22:41:27 +11:00
SteveGilvarry
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
SteveGilvarry
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
Kaarle Ritvanen
5b047dc74b
zm_event: fix overlap in memcpy buffers
2016-02-20 23:58:36 +02:00
Isaac Connor
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
Kaarle Ritvanen
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
arjunrc
e8c38dd016
demoted to debug due to lots of logs
2016-02-11 15:12:21 -05:00
Robin Daermann
f5ef721ebd
Add IP6 address type to valid types for ConnInfo
2016-02-10 17:53:00 +01:00
Robin Daermann
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
Dmitry Smirnov
5bcc414038
codespell: misc. spelling corrections
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 20:41:36 +11: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
904f584fcb
CMD_QUIT definition
2016-01-29 10:00:02 -05:00
arjunrc
38bca6b95d
added CMD_QUIT to kill zms via command
2016-01-29 09:58:57 -05:00
arjunrc
47b2cdbb96
added CMD_QUIT to kill zms via command
2016-01-29 09:58:50 -05:00
Isaac Connor
f275498790
Add Debug for sql used to load other than local monitors
2016-01-26 21:00:32 -05:00
Isaac Connor
902065a6c1
Add Debug for sql used to load local monitors
2016-01-26 20:59:07 -05:00
Isaac Connor
3a0b28f168
Add Debug/Info lines reporting multi-server status
2016-01-26 20:53:34 -05:00
Isaac Connor
3a18a62bc6
Add ServerId column when inserting log line into database
2015-12-30 08:29:45 -05:00
Isaac Connor
f357ea6ccd
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-12-28 11:53:04 -05:00
Isaac Connor
ccded54937
put back missing col++
2015-12-28 11:52:40 -05:00
SteveGilvarry
3f1c782ff7
Fix random extra semicolon
2015-12-28 16:29:04 +11:00
Isaac Connor
e76cc59bad
revert whitespace changes
2015-12-21 13:42:44 -05:00
Isaac Connor
36f83aa412
revert whitespace changes
2015-12-21 13:35:17 -05:00
Isaac Connor
609ab79f81
revert whitespace changes
2015-12-21 13:32:57 -05:00
Isaac Connor
1fee421500
revert whitespace changes
2015-12-21 13:29:41 -05:00
Isaac Connor
c0a79567e6
revert whitespace changes
2015-12-21 13:26:24 -05:00
Isaac Connor
fdf1912ec1
revert whitespace changes
2015-12-21 13:11:18 -05:00
Isaac Connor
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
Isaac Connor
af9fc1de90
revert white space changes.
2015-12-21 12:57:05 -05:00
SteveGilvarry
e28e3c2b75
Merge branch 'master' into feature-h264-videostorage
2015-12-20 14:13:30 +11:00
SteveGilvarry
af76d19646
Add a constrained namespace implementation around Authenticator class to prevent conflict with libvlc live555.
2015-12-18 01:47:10 +11:00
Isaac Connor
688ee7f103
Merge branch 'zms_socket_lock' into multi-server
2015-12-04 16:41:26 -05:00
Isaac Connor
0fc68e2e91
delete lock when we are done with it
2015-12-04 16:38:24 -05:00
Isaac Connor
be36301779
use exclusive lock, add includes
2015-12-04 16:35:27 -05:00
Isaac Connor
6d605362fc
Merge branch 'zms_socket_lock' into multi-server
2015-12-04 15:39:51 -05:00
Isaac Connor
e637915823
add a lock around the socket creating/deleting.
2015-12-04 15:39:37 -05:00
SteveGilvarry
220ee5e516
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-11-29 13:17:22 +11:00
Isaac Connor
f7cc2fb44f
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-11-23 10:42:14 -05:00
Andrew Bauer
a9609d2a43
fix mem alloc fault in zm_monitor.cpp
2015-11-21 12:17:23 -06:00
Isaac Connor
4d6c4355db
Merge branch 'master' into multi-server
2015-11-20 16:07:50 -05:00
SteveGilvarry
6002f251c0
Add FFMPEGInit back
2015-11-05 19:36:11 +11:00
SteveGilvarry
477e63a878
Reorder RTSPDescribe to avoid -wreorder warnings
2015-11-05 17:19:58 +11:00
Heng Liu
44f63443c1
video branch ffmpeg 2.9 fixes
...
ffmpeg 2.9 patched removed SSE2 CPU
2015-11-04 14:43:45 -08:00
Heng Liu
4e263f5913
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
src/zm_ffmpeg.h
2015-11-04 14:39:52 -08:00
Robin Daermann
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
SteveGilvarry
5423be9eb8
Revert space removal around PRId64
2015-11-05 01:25:44 +11:00
SteveGilvarry
5b68656602
Try "STDC_FORMAT_MACROS" to see if that helps Travis on gcc 4.6.3
2015-11-05 01:09:39 +11:00
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
Isaac Connor
89e13c1cc0
leave 1 char at end for \0
2015-08-14 16:10:44 -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
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
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