da157f5a1a
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-04-30 22:27:10 +10:00
819dad455e
whitespace/tabs
2016-04-29 09:11:14 -04:00
b41a3b1b25
fix tabs/shiftwidth
2016-04-29 09:01:28 -04:00
5eebc50bfb
tabs to spaces
2016-04-29 08:57:31 -04:00
728bffa6a0
Check and set audio to mono
2016-04-29 08:52:25 -04:00
af66105c37
Merge branch 'master' into storageareas
2016-04-29 08:28:53 -04:00
e73935a15b
Clean up extraneous avutil include
2016-04-29 21:29:07 +10:00
8452c4bce5
Fix tab to spaces merge issues
2016-04-29 21:27:28 +10:00
097e7f3906
Merge branch 'master' into storageareas
2016-04-28 16:40:44 -04:00
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
30b3fa8a8b
add a cast to help the compile figure out which function to use
2016-04-28 12:57:38 -04:00
1096461793
Need a cast to handle old avformat
2016-04-28 12:57:14 -04:00
1282e36bb2
av_get_media_type_string is not available in trusty
2016-04-28 12:56:40 -04:00
337d8a748c
simplify the separator stuff
2016-04-28 12:56:19 -04:00
fac07cba6d
Merge branch 'master' into tabs_to_spaces
2016-04-28 09:31:40 -04:00
629f141734
Merge pull request #1441 from SteveGilvarry/remove_commented_code
...
Delete large commented out code segment
2016-04-28 09:30:43 -04:00
59406fd03a
Merge branch 'master' into storageareas
2016-04-28 09:24:36 -04:00
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
dcf3852124
Starting to convert to boost.interprocess
2016-04-28 01:28:37 +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
d936312207
revert
2016-04-25 16:46:23 -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
851e8f46ff
redo fix_rotate
2016-04-25 15:57:39 -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
7fcd12fab9
Packetqueue tweaks, need to move this stuff up to monitor to maintain a packet buffer
2016-04-25 22:06:07 +10:00
44f32f46b7
deprecate zmdbFetchOne in favor of zmDbRow
2016-04-20 11:56:58 -04:00
2fcdee87d9
Merge branch 'storageareas' into valgrind
2016-04-20 10:01:30 -04:00
71d79fac99
Merge ../ZoneMinder.SteveGilvarry into valgrind
2016-04-20 09:59:08 -04:00
d2870f0692
move the mysql_free_result, looks like we can't free it until we free the row
2016-04-20 09:44:11 -04:00
98fa65310b
whitespace changes
2016-04-17 09:29:00 -04:00
d6f640907f
add avformat_network_init
2016-04-17 09:28:43 -04:00
72bf8ac2b8
up the debug level for Have Keyframe
2016-04-16 15:13:36 -04:00
e4f116af2f
more debug and comments, return checking
2016-04-15 15:32:48 -04:00
111b1a1566
add back lastKeyframePkt
2016-04-15 15:23:22 -04:00
db52a61b01
More debugging and restore copying lastkeyframe. Also init videoStore to NULL so that we don't crash
2016-04-15 15:22:58 -04:00
f1e69463b6
More debugging and restore copying lastkeyframe. Also init videoStore to NULL so that we don't crash
2016-04-15 15:22:47 -04:00
b3e68ca2f7
Must init videoStore in constuctor
2016-04-15 15:10:26 -04:00
1e8450ecbf
av_set_parameters was deprecated a long time ago
2016-04-15 12:50:05 -04:00
21b35c4df0
Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas
2016-04-14 22:12:52 -04:00
b19f990147
Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas
2016-04-14 22:12:49 -04:00
3e683e3002
Add a call to av_set_parameters, found some code that says it must be called
2016-04-14 22:12:34 -04:00
bcec1813e6
More return value checking/commenting
2016-04-14 21:54:17 -04:00
c7dceafd67
fix first param to zm_dump_stream_format
2016-04-14 12:42:47 -04:00
30066f788d
Merge branch 'feature-h264-videostorage' into storageareas
2016-04-14 12:35:21 -04:00
c189e60d9b
add some comments, and dump filename and AVFormatContext on failure to write header
2016-04-14 12:34:52 -04:00
fb48c909ce
Merge branch 'log_include_mId' into storageareas
2016-04-12 08:42:38 -04:00
2724b10163
Include mId in syslog logging.
2016-04-12 08:42:12 -04:00
28b30ecb47
Merge pull request #1377 from ZoneMinder/random_fixes
...
Random fixes
2016-04-11 12:04:05 -05:00
61bd60184a
Merge branch 'random_fixes' into storageareas
2016-04-11 11:28:24 -04:00
7c0f524e1f
Merge branch 'master' into random_fixes
2016-04-11 11:24:41 -04:00
e1cbaed2a3
Merge branch 'icon_video' into storageareas
2016-04-06 12:50:46 -04:00
fefa2dc804
add a test and error message if the codec is not h264
2016-04-06 12:48:16 -04:00
dc7f2ff353
fix merge problems
2016-04-06 11:44:57 -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
765f79a87f
Merge branch 'icon_video' into storageareas
2016-04-06 11:16:38 -04:00
2a6071561d
use zm_dump_stream_format to dump information about the packet to the log
2016-04-06 10:51:58 -04:00
9dd1c8cb4a
add some packet dumping functions, stolen from ffmpeg, but these will use our logging functions
2016-04-06 10:51:20 -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
30d2b475eb
increase log level on some success debug statements
2016-04-06 08:39:33 -04:00
a92764f71a
check return codes and report errors when writing trailer and closing file
2016-04-06 08:39:09 -04:00
dd408cc9a1
Don't skip audo stream detection by finding video stream
2016-04-06 08:38:34 -04:00
4bc200f839
fix merge
2016-04-06 08:38:10 -04:00
9d9369db6f
Don't skip audio stream by finding a video stream
2016-04-06 08:37:28 -04:00
9a795432cf
merge all the commits from the messed up iconnor_video branch
2016-04-05 17:14:46 -04:00
60642c1fff
Merge branch 'iconnor_video' into storageareas
2016-04-05 12:32:33 -04:00
04800afaf5
Some documenting comments and debug lines, mostly just trying to understand what the code does
2016-04-05 12:30:22 -04:00
238a25a302
Merge branch 'master' into iconnor_video
2016-04-05 09:38:59 -04:00
f1331df4d9
Use != instead of == when checking dts tiemscale stuff
2016-04-05 09:01:54 -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
be13e56c3c
add some comments
2016-04-04 21:58:16 -04: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
a60a0959fc
fix SQL for inserting event. output the sql on error
2016-04-04 17:41:06 -04:00
de5b9c6dae
I don't know what the Name of an event is, but the column count and value count are off
2016-04-04 16:56:40 -04:00
03b1ced568
tabs to spaces and use 2space indenting
2016-04-04 10:11:48 -04:00
966fbb1a10
Add Packet Queue
2016-04-04 20:04:14 +10:00
9287cd0e0a
undo code style changes and whitespace changes
2016-04-01 15:47:40 -04:00
89598da5c1
undo code style changes and whitespace changes
2016-04-01 15:30:30 -04:00
58c39f930e
revert some structure changes
2016-04-01 14:57:48 -04:00
f4fc129ecf
revert some structure changes
2016-04-01 14:15:31 -04:00
86c888d079
revert some structure changes
2016-04-01 14:14:02 -04:00
9493e99587
Add video file to event data.
2016-04-01 14:06:31 -04:00
03cae9d2f2
Add video file to event data.
2016-04-01 14:06:28 -04:00
82b32578ec
Merge branch 'master' into iconnor_video
2016-04-01 12:54:09 -04:00
6816a4c75b
Merge branch 'iconnor_video' into storageareas
2016-04-01 11:35:38 -04:00
abcf48b65c
Merge branch 'master' into feature-h264-videostorage
2016-04-01 08:53:45 -04:00
2a892c5b9a
Merge branch 'iconnor_video' into storageareas
2016-03-31 15:34:52 -04:00
5c68e0c9cb
structure, whitespace fixes. Add not storing audio frames
2016-03-31 15:33:27 -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
1220f22eac
Merge branch 'iconnor_video' into storageareas
2016-03-31 14:04:58 -04:00
56d95bb949
Merge branch 'iconnor_video' into storageareas
2016-03-31 14:02:56 -04:00
c7e766faef
finish the record_audio constructor defs
2016-03-31 13:30:31 -04:00
c26dbb9028
rough in record_audio, and do lots of whitespace cleanups
2016-03-31 12:54:56 -04:00
2a3ed0c32c
Add record_audio member, also correct whitespace
2016-03-31 12:17:17 -04:00
4e8255c80a
Add record_audio member
2016-03-31 12:16:50 -04:00
92b98e1953
spacing, code structure and code documentation. Also, add in a flag to say whether to store the audio packets
2016-03-31 11:55:21 -04:00
fa08646243
spacing fix
2016-03-31 11:54:21 -04:00
aa516dd575
undo the multi-line
2016-03-31 11:24:27 -04:00
c9a1a9020d
Merge h264
2016-03-31 11:03:36 -04:00
e5a36c02bd
Merge remote-tracking branch 'origin/master' into video_remote
2016-03-30 16:55:24 -04:00
ea49dc20d1
Merge branch 'master' into storageareas
2016-03-30 10:58:07 -04:00
204a128ecc
fix use of connected when it should be mem_ptr
2016-03-29 15:46:47 -04:00
1262e831ac
rework zmu to load data from the last event with frames when it can't connect to zmc
2016-03-29 14:36:16 -04:00
58f19f14e1
print ip and hostname when can't connect
2016-03-29 11:51:58 -04:00
34c50b8cfc
ipv6 support
2016-03-29 11:51:28 -04:00
96ff5ec619
include netinet/in.h for FreeBSD so that we can do ipv6 ip lookups
2016-03-28 05:39:26 -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
e12152602b
t push origin masterMerge branch 'knnniggett-zmtrigger2' into storageareas
2016-02-22 09:15:45 -05:00
5b047dc74b
zm_event: fix overlap in memcpy buffers
2016-02-20 23:58:36 +02:00
68babd783b
Merge branch 'master' into storageareas
2016-02-17 09:46:56 -05: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
b7256a6891
Merge branch 'master' into storageareas
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
version
2016-02-10 09:17:40 -05: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
fa7ec2179d
Bring is more of the h264 code and add some master changes to the duplicated code
2016-02-05 01:47:13 +11:00
64bc7398fc
Fixes for remote h264 passthrough
2016-02-05 01:47:13 +11:00
78b0a9d0a9
Add videostore to remote_rtsp, still need to check stream is h264
2016-02-05 01:47:12 +11:00
48283191ec
Merge branch 'master' into storageareas
2016-02-01 15:47:08 -05: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
1504b368db
Warning to Debug for Storage class with no Id
2016-01-04 15:21:23 -05:00
93dbc3f0c1
Merge multi-server updates and bump version
2016-01-01 16:31:02 -05:00
3a18a62bc6
Add ServerId column when inserting log line into database
2015-12-30 08:29:45 -05:00
98b6ef36d4
Merge branch 'multi-server' into newpointone
...
Conflicts:
src/zm_monitor.cpp
2015-12-28 13:13:15 -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
eccfced6d4
Merge branch 'multi-server' into newpointone
...
Conflicts:
distros/ubuntu1204/apache.conf
2015-12-22 09:54:13 -05: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
ca07b951cb
Merge branch 'master' into newpointone
...
Conflicts:
docs/installationguide/ubuntu.rst
2015-12-21 12:41:25 -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
6bb22a9a1b
change method from getPath to Path
2015-12-15 13:27:25 -05:00
7588f6088f
change method from getPath to Path
2015-12-15 13:27:18 -05:00
916cfe5ee6
change method from getPath to Path
2015-12-15 12:10:07 -05:00
0f4757b1ad
change method from getPath to Path
2015-12-15 12:10:01 -05:00
6daa8e2290
add server_id to event_data
2015-12-15 12:09:45 -05:00
2597bbd9bf
use storage object instead of config.dir_events
2015-12-15 12:09:34 -05:00
1151fe39ab
More debug lines, and use the default config.events_dir path when not specified otherwise
2015-12-15 11:17:32 -05:00
d7568180fe
add getStorage method to return the desired Storage Area object
2015-12-15 11:16:51 -05:00
010d7b3d64
convert to using storage->getPath instaed of config.events_dir
2015-12-15 11:11:34 -05:00
6aadd7330a
make loading a null or invalid storage area not be fatal, but use the default path
2015-12-15 09:39:29 -05:00
14cde582cf
Merge branch 'multi-server' into multiserverplusstorage
...
Conflicts:
src/zm_monitor.h
2015-12-14 16:55:26 -05:00
b2b1afa8ad
Merge master
2015-12-14 15:49:32 -05: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
Steve Gilvarry
Isaac Connor
Isaac Connor
Isaac Connor
abi
root
Andrew Bauer
Jon Burgess
Kaarle Ritvanen
arjunrc
Robin Daermann
Dmitry Smirnov
SteveGilvarry
Andrew Bauer
Heng Liu