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
|
d936312207
|
revert
|
2016-04-25 16:46:23 -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
|
851e8f46ff
|
redo fix_rotate
|
2016-04-25 15:57:39 -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
|
44f32f46b7
|
deprecate zmdbFetchOne in favor of zmDbRow
|
2016-04-20 11:56:58 -04:00 |
|
Isaac Connor
|
2fcdee87d9
|
Merge branch 'storageareas' into valgrind
|
2016-04-20 10:01:30 -04:00 |
|
Isaac Connor
|
71d79fac99
|
Merge ../ZoneMinder.SteveGilvarry into valgrind
|
2016-04-20 09:59:08 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
98fa65310b
|
whitespace changes
|
2016-04-17 09:29:00 -04:00 |
|
Isaac Connor
|
d6f640907f
|
add avformat_network_init
|
2016-04-17 09:28:43 -04:00 |
root
|
72bf8ac2b8
|
up the debug level for Have Keyframe
|
2016-04-16 15:13:36 -04:00 |
|
Isaac Connor
|
111b1a1566
|
add back lastKeyframePkt
|
2016-04-15 15:23:22 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
1e8450ecbf
|
av_set_parameters was deprecated a long time ago
|
2016-04-15 12:50:05 -04:00 |
|
Isaac Connor
|
21b35c4df0
|
Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas
|
2016-04-14 22:12:52 -04:00 |
|
Isaac Connor
|
b19f990147
|
Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas
|
2016-04-14 22:12:49 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
bcec1813e6
|
More return value checking/commenting
|
2016-04-14 21:54:17 -04:00 |
|
Isaac Connor
|
c7dceafd67
|
fix first param to zm_dump_stream_format
|
2016-04-14 12:42:47 -04:00 |
|
Isaac Connor
|
30066f788d
|
Merge branch 'feature-h264-videostorage' into storageareas
|
2016-04-14 12:35:21 -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 |
|
Isaac Connor
|
fb48c909ce
|
Merge branch 'log_include_mId' into storageareas
|
2016-04-12 08:42:38 -04:00 |
|
Isaac Connor
|
2724b10163
|
Include mId in syslog logging.
|
2016-04-12 08:42:12 -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
|
61bd60184a
|
Merge branch 'random_fixes' into storageareas
|
2016-04-11 11:28:24 -04:00 |
|
Isaac Connor
|
7c0f524e1f
|
Merge branch 'master' into random_fixes
|
2016-04-11 11:24:41 -04:00 |
|
Isaac Connor
|
e1cbaed2a3
|
Merge branch 'icon_video' into storageareas
|
2016-04-06 12:50:46 -04: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
|
dc7f2ff353
|
fix merge problems
|
2016-04-06 11:44:57 -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
|
765f79a87f
|
Merge branch 'icon_video' into storageareas
|
2016-04-06 11:16:38 -04:00 |
|
Isaac Connor
|
2a6071561d
|
use zm_dump_stream_format to dump information about the packet to the log
|
2016-04-06 10:51:58 -04:00 |
|
Isaac Connor
|
9dd1c8cb4a
|
add some packet dumping functions, stolen from ffmpeg, but these will use our logging functions
|
2016-04-06 10:51:20 -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
|
30d2b475eb
|
increase log level on some success debug statements
|
2016-04-06 08:39:33 -04:00 |
|
Isaac Connor
|
a92764f71a
|
check return codes and report errors when writing trailer and closing file
|
2016-04-06 08:39:09 -04:00 |
|
Isaac Connor
|
dd408cc9a1
|
Don't skip audo stream detection by finding video stream
|
2016-04-06 08:38:34 -04:00 |
|
Isaac Connor
|
4bc200f839
|
fix merge
|
2016-04-06 08:38:10 -04:00 |
|
Isaac Connor
|
9d9369db6f
|
Don't skip audio stream by finding a video stream
|
2016-04-06 08:37:28 -04:00 |
|
Isaac Connor
|
9a795432cf
|
merge all the commits from the messed up iconnor_video branch
|
2016-04-05 17:14:46 -04:00 |
|
Isaac Connor
|
60642c1fff
|
Merge branch 'iconnor_video' into storageareas
|
2016-04-05 12:32:33 -04:00 |
|
Isaac Connor
|
04800afaf5
|
Some documenting comments and debug lines, mostly just trying to understand what the code does
|
2016-04-05 12:30:22 -04:00 |
|
Isaac Connor
|
238a25a302
|
Merge branch 'master' into iconnor_video
|
2016-04-05 09:38:59 -04:00 |
|
Isaac Connor
|
f1331df4d9
|
Use != instead of == when checking dts tiemscale stuff
|
2016-04-05 09:01:54 -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 |
|
Isaac Connor
|
be13e56c3c
|
add some comments
|
2016-04-04 21:58:16 -04: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
|
a60a0959fc
|
fix SQL for inserting event. output the sql on error
|
2016-04-04 17:41:06 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
03b1ced568
|
tabs to spaces and use 2space indenting
|
2016-04-04 10:11:48 -04:00 |
|
Isaac Connor
|
9287cd0e0a
|
undo code style changes and whitespace changes
|
2016-04-01 15:47:40 -04:00 |
|
Isaac Connor
|
89598da5c1
|
undo code style changes and whitespace changes
|
2016-04-01 15:30:30 -04:00 |
|
Isaac Connor
|
58c39f930e
|
revert some structure changes
|
2016-04-01 14:57:48 -04:00 |
|
Isaac Connor
|
f4fc129ecf
|
revert some structure changes
|
2016-04-01 14:15:31 -04:00 |
|
Isaac Connor
|
86c888d079
|
revert some structure changes
|
2016-04-01 14:14:02 -04:00 |
|
Isaac Connor
|
9493e99587
|
Add video file to event data.
|
2016-04-01 14:06:31 -04:00 |
|
Isaac Connor
|
03cae9d2f2
|
Add video file to event data.
|
2016-04-01 14:06:28 -04:00 |
|
Isaac Connor
|
82b32578ec
|
Merge branch 'master' into iconnor_video
|
2016-04-01 12:54:09 -04:00 |
|
Isaac Connor
|
6816a4c75b
|
Merge branch 'iconnor_video' into storageareas
|
2016-04-01 11:35:38 -04:00 |
|
Isaac Connor
|
abcf48b65c
|
Merge branch 'master' into feature-h264-videostorage
|
2016-04-01 08:53:45 -04:00 |
|
Isaac Connor
|
2a892c5b9a
|
Merge branch 'iconnor_video' into storageareas
|
2016-03-31 15:34:52 -04:00 |
|
Isaac Connor
|
5c68e0c9cb
|
structure, whitespace fixes. Add not storing audio frames
|
2016-03-31 15:33:27 -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
|
1220f22eac
|
Merge branch 'iconnor_video' into storageareas
|
2016-03-31 14:04:58 -04:00 |
|
Isaac Connor
|
56d95bb949
|
Merge branch 'iconnor_video' into storageareas
|
2016-03-31 14:02:56 -04:00 |
|
Isaac Connor
|
c7e766faef
|
finish the record_audio constructor defs
|
2016-03-31 13:30:31 -04:00 |
|
Isaac Connor
|
c26dbb9028
|
rough in record_audio, and do lots of whitespace cleanups
|
2016-03-31 12:54:56 -04:00 |
|
Isaac Connor
|
2a3ed0c32c
|
Add record_audio member, also correct whitespace
|
2016-03-31 12:17:17 -04:00 |
|
Isaac Connor
|
4e8255c80a
|
Add record_audio member
|
2016-03-31 12:16:50 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
fa08646243
|
spacing fix
|
2016-03-31 11:54:21 -04:00 |
|
Isaac Connor
|
aa516dd575
|
undo the multi-line
|
2016-03-31 11:24:27 -04:00 |
|
Isaac Connor
|
c9a1a9020d
|
Merge h264
|
2016-03-31 11:03:36 -04:00 |
|
Isaac Connor
|
e5a36c02bd
|
Merge remote-tracking branch 'origin/master' into video_remote
|
2016-03-30 16:55:24 -04:00 |
|
Isaac Connor
|
ea49dc20d1
|
Merge branch 'master' into storageareas
|
2016-03-30 10:58:07 -04:00 |
Isaac Connor
|
204a128ecc
|
fix use of connected when it should be mem_ptr
|
2016-03-29 15:46:47 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
58f19f14e1
|
print ip and hostname when can't connect
|
2016-03-29 11:51:58 -04:00 |
|
Isaac Connor
|
34c50b8cfc
|
ipv6 support
|
2016-03-29 11:51:28 -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 |