a1847aff75
add in new experimental nvsocket camera
2017-10-02 12:57:40 -04:00
ddb7305aab
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-02 09:11:55 -04:00
8c1cfb28a5
use c-style casts because they work
2017-09-26 16:13:26 -04:00
94fd113b63
use c-style casts because they work
2017-09-26 16:12:20 -04:00
1ba0a52769
remove const... which is preventing us from building on trusty
2017-09-26 12:53:54 -04:00
38a4ca1a6f
use storageareas when outputting zone diag images
2017-09-26 09:33:33 -04:00
e277456682
put parenthesis back in
2017-09-26 09:15:54 -04:00
9f93bfc23b
use Monitor Id in path to diag images instead of monitor name as the name is a convenience link and not guaranteed to exist
2017-09-25 18:45:58 -04:00
1791d3d5b7
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-09-25 16:23:33 -04:00
84be41998a
make debug lines more informative
2017-09-25 16:23:27 -04:00
74bb2da668
remove extra parenthesis
2017-09-25 16:23:15 -04:00
3227599e01
google code style
2017-09-25 16:22:52 -04:00
869d2b4f16
make failure to symlink non-fatal. Someday we may want to use a file store that doesn't do symlinks
2017-09-25 16:22:41 -04:00
8941bc80b8
reduce log level for success debug message
2017-09-25 16:21:46 -04:00
2a39cf2bcd
split videostore opening out of the constructor so that we can test for failure
2017-09-25 15:28:14 -04:00
fef503f90c
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-09-23 13:42:44 -04:00
fa37a55226
if debug is not on, limit the log level to each destination. This makes checks to meffectivelevel work
2017-09-23 13:41:20 -04:00
7d2453e7ac
fix google code style
2017-09-04 15:28:23 -04:00
08bdf5a729
fix build on trusty
2017-08-24 12:19:57 -04:00
2a4f751a4f
ffmpeg versionc heck
2017-08-24 12:00:48 -04:00
2daae43760
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-08-24 10:14:00 -04:00
48e9e12063
assume source=monitor when a monitor_id is specified
2017-08-24 10:13:46 -04:00
789de37d33
fix builds on older ffmpeg
2017-08-24 09:53:40 -04:00
a4cf47b5c3
move swscale into it's own files
2017-08-23 15:06:12 -04:00
a81ff85fbb
add ffmpeg decoding of a .mp4 to get the frames
2017-08-23 15:05:44 -04:00
5c13ae26e3
Merge branch 'storageareas' into work_on_zms
2017-08-23 10:43:19 -04:00
732ebf6df4
shorted some variable names and correct spacing
2017-08-23 10:37:32 -04:00
eb5cee7f3e
use ifdef around uses of AV_CODEC_ID_H265 and fix google code style
2017-08-23 10:14:06 -04:00
e98ea0b891
fix non hwaccel build
2017-08-22 10:47:37 -04:00
676c4b7ddc
Merge branch 'master' into storageareas
2017-08-22 09:52:14 -04:00
d406d9549c
use int instead of unsigned int. Google code style says it's right, and it gets rid of a comparison warning
2017-08-22 09:47:30 -04:00
ac5d1738ea
allow changing of the timestamp char code delimeter ( #1972 )
2017-08-21 11:27:11 -04:00
cf8560b648
fix duration if it's negative
2017-08-21 10:15:56 -04:00
a63d0878b6
remove more hwaccel code
2017-08-16 13:41:44 -04:00
da5438a6ff
detect hardware accel capabilities
2017-08-16 12:16:15 -04:00
9e2aa941fc
rough in vaapi and qsv decoders. More debugging
2017-08-16 11:31:47 -04:00
ad0644b906
Merge branch 'storageareas' into vaapi
2017-08-15 16:05:25 -04:00
e24a2935d2
remove unneeded error message
2017-08-15 13:49:11 -04:00
591fdfe68c
fix
2017-08-15 13:44:23 -04:00
38111e80a5
use AVERROR_EOF instead of EOF
2017-08-15 13:17:51 -04:00
ae579c9649
potentially fix a crash when camera sends aac
2017-08-15 12:16:29 -04:00
adab628af9
fix video speed, various other
2017-08-14 18:22:52 -04:00
b255414bbb
Merge branch 'storageareas' into remove_ffmpeg_thread
2017-08-14 11:15:25 -04:00
0f0ab6170b
Don't decode video until we have received a keyframe.
2017-08-14 11:15:09 -04:00
49464d381a
Merge branch 'master' into storageareas
2017-08-14 10:44:40 -04:00
087b7abb94
Merge branch 'master' into fix_event_viewing
2017-08-14 10:41:04 -04:00
ecb7df0e8b
Support SSL for mysql connections ( #1965 )
...
* Fix install location for config files when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Omitted README file that should have appeared in /etc/zm/conf.d
* Fix location for configs when building to alternate directory.
* Fix works, but this should go on a branch instead.
* Fix works, but this should go on a branch instead.
* Fix location for configs when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Remove double quotes. This is a list of paths.
* Allow SSL database connection to be secured with SSL.
* Fix incorrect variable name
* Fix PHP syntax errors
* SSL connection parameters must also be passed in API.
* Revert fixes to build files; they should not be in this branch.
2017-08-14 10:30:42 -04:00
014951bf78
fix connect
2017-08-11 13:00:18 -04:00
83f8a240d5
blah
2017-08-11 12:20:46 -04:00
daee5b4450
experiment with no ffmpeg thread
2017-08-11 12:03:37 -04:00
536ccc0cec
maybe fix memleak, maybe fix crash
2017-08-10 15:44:20 -04:00
c5c68d064e
Merge pull request #1930 from connortechnology/split_zmeventstream
...
split EventStream into it's own files
2017-08-09 20:36:17 -05:00
cc28af8ed2
rework things to always start the recording on a video keyframe. Also fix pts/dts of remaining audio frames
2017-08-09 12:50:46 -04:00
b203e10c65
remove some newlines that shouldn't be there. Fix some logic when flushing audio encoder
2017-08-04 14:14:25 -04:00
00533fc624
potentially fix memleaks
2017-08-03 12:41:26 -04:00
5a73c38237
video storage fixes ( #1958 )
...
* use a monitor object instead of just a db array.
* fix braces, spacing, move pod docs to bottom
* Fix memleak by freeing input and output frames
* Always set the packet stream_index to the id of the output stream.
2017-08-02 16:29:23 -04:00
3467b29a0c
fix setting of packet stream index
2017-08-02 16:15:38 -04:00
4f032c8e65
rough in vaapi
2017-08-02 16:15:11 -04:00
259b7f7655
fix memleak
2017-07-31 15:49:27 -04:00
49319990fa
Don't keep setting the event_file unnecessarily. Add some code comments
2017-07-26 10:38:18 -04:00
e92974c5d4
fix spacing
2017-07-13 09:41:46 -04:00
d3ec50aa69
various fixes plus use global db functions in logger
2017-07-06 17:45:23 -04:00
323aedde4e
fix merge
2017-07-06 12:41:15 -04:00
2a71b0f170
Merge branch 'storageareas' into work_on_zms
2017-07-06 12:39:44 -04:00
c3c6459052
Merge branch 'montagereview_rework' into storageareas
2017-07-05 15:34:02 -04:00
95ba837bda
fix braces
2017-07-05 14:25:23 -04:00
0e40897e02
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-05 14:24:09 -04:00
8569c7523a
fix braces
2017-07-05 14:11:58 -04:00
2bc679e65e
if a 0 scale is given, default to 100%
2017-07-05 14:11:17 -04:00
834d1dddfa
fix braces
2017-07-05 14:10:09 -04:00
1849b1e69b
fix code spacing, add codecpar dumping when failed to write frame
2017-07-05 13:09:00 -04:00
fdd0e8dc1b
fix spacing
2017-07-05 13:08:31 -04:00
efba7be9c7
switch back to int i... google style guide says to use signed counters in for loops. Ok. Get's rid of compiler warning because i_nales is signed.
2017-07-05 13:08:16 -04:00
121aba0308
add parenthesis around truth value to quieten compiler
2017-06-29 15:41:21 -04:00
90696331a9
Merge branch 'master' into storageareas
2017-06-26 21:58:11 -04:00
62d6394923
finish roughing in ffmpeg_input
2017-06-26 16:55:49 -04:00
24dd3a8c66
fix loading starttime of event
2017-06-26 11:20:10 -04:00
0d8e4656dc
fix braces
2017-06-26 09:46:07 -04:00
52f1e2d235
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-23 10:11:52 -04:00
b73c0ba978
rough in zm_ffmpeg_input and split out eventstream
2017-06-22 17:58:32 -04:00
fcc852c859
fix cpplint.py complaints
2017-06-22 16:06:31 -04:00
4df354dc24
fix order of send_frame and break and fix if ( usleep ) which should be if ( delta_us )
2017-06-22 10:48:15 -04:00
c241b6dddd
Merge branch 'split_zmeventstream' into storageareas
2017-06-22 10:46:32 -04:00
950c8f19d3
Upstream FreeBSD patches ( #1926 )
...
* apply FreeBSD patches
* timeval struct needs time.h
* typo
* added forgotten destination for systemd startup script install
2017-06-22 10:14:24 -04:00
394001604d
add the new files for EventStream
2017-06-22 10:12:04 -04:00
226514e887
split EventStream into it's own files
2017-06-22 10:10:28 -04:00
a29ad958c9
Merge branch 'master' into storageareas
2017-06-22 10:00:28 -04:00
1bba664e3d
whitspace
2017-06-22 09:55:45 -04:00
76f63686cb
Merge branch 'fix_event_viewing' into storageareas
2017-06-22 09:24:31 -04:00
5e75588bfb
Fix event viewing. Output a frame immediately on zoom in/out. Fix recursive loop on play/pause
2017-06-21 17:14:02 -04:00
91a070b835
Merge branch 'master' into storageareas
2017-06-15 13:13:08 -04:00
8527e5f1de
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-15 13:03:09 -04:00
119f8fc86c
Fix version checks to fix build on yaketty
2017-06-15 13:02:54 -04:00
b886a2daa2
Merge branch 'master' into storageareas
2017-06-14 11:25:02 -04:00
3dc9594461
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-14 11:24:54 -04:00
07a2d49a41
Merge branch 'log_no_truncate'
2017-06-14 11:23:39 -04:00
a4b3f6b41a
fix form of delete used
2017-06-14 10:54:21 -04:00
b51d885f66
fix build on old ffmpeg
2017-06-14 10:36:08 -04:00
9f301e3c51
Merge branch 'log_no_truncate' into storageareas
2017-06-14 10:18:27 -04:00
1361b8952f
change mode of opening log files to append instead of overwrite
2017-06-14 10:15:08 -04:00
f0d80ddfd4
fix runstate merge
2017-06-13 21:18:09 -04:00
7a67a5e475
fix merge
2017-06-13 21:15:58 -04:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
dd70eb3e5f
more deprecation fixes
2017-06-13 17:06:50 -04:00
42100d9a33
introduce current_event in videostore_data so we know which event we are writing a video file for. Also, GetLastEventId so that non-friends can find out the event id of the current event.
2017-06-13 17:05:37 -04:00
3c053b36ef
introduce zm_dump_codecpar and zm_dump_codec to be used for debugging
2017-06-13 16:51:51 -04:00
417421b1d8
move include <sys/uio.h> outside defined(BSD) block ( #1919 )
2017-06-13 15:39:12 -04:00
bf04a68085
Merge pull request #1752 from connortechnology/filter_by_runstate
...
rough in the ability to filter on RunState
2017-06-12 20:54:17 -05:00
bacf65ae9a
Migrate values from Options -> Paths to zm.conf ( #1908 )
...
* initial commit to migrate contents of Options->Paths to zm.conf
* remove paths items from configdata.pm
* remove paths tab from options
* update deb packaging scripts with new cmake vars
* remove extraneous file
* save custom paths variables to config file before dB is freshened
* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
809d20dcd0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-06-09 14:25:11 -04:00
05d0e0ed71
Merge branch 'master' into storageareas
2017-06-09 14:20:49 -04:00
781d49dfb1
fix merge
2017-06-09 14:19:31 -04:00
3bfac9faff
Merge branch 'master' into storageareas
2017-06-09 13:00:24 -04:00
162cc05a33
when debug is turned on, fflush after every line. Debug logging is almost useless when debugging a crash without this.
2017-06-09 11:05:44 -04:00
f8cb0a5e21
Merge branch 'master' into add_was_alarmed
2017-06-09 10:46:01 -04:00
9669fede18
fix merge by putting back my dbRow object
2017-06-09 10:18:15 -04:00
371b86300a
Merge branch 'master' into storageareas
2017-06-08 14:23:40 -04:00
d7b291f933
add more debug
2017-06-08 13:44:22 -04:00
02b2d8a968
put in ffmpeg version test
2017-06-08 12:22:28 -04:00
01717a5c14
Merge branch 'master' into filter_by_runstate
2017-06-06 20:34:47 -04:00
070f0d5d62
don't init converted_input_samples
2017-06-06 15:57:42 -04:00
1ab5e0e374
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-06 15:36:10 -04:00
7d97267dd2
fix compile on old ffmpeg
2017-06-06 15:35:17 -04:00
2bc6f1627e
Add support for conf.d subfolder ( #1902 )
...
* cmake changes to support conf.d
* php changes to support conf.d
* perl changes to support conf.d
* C changes to support conf.d
* add conf.d support to rpmspecfile
* fix typo
* specify ZM_CONFIG_SUBDIR in relevant target distros
* put back my config_file perl definition
* remove quotes from ZM macros
* fix snprintf
* add README to conf.d folder
* adjust rpm specfile
* remove custom permissions from README in rpmspecfile
* modify rpm README documentation to reflect conf.d support
* set ZM_CONFIG_SUBDIR in debian rules file
2017-06-05 16:39:19 -04:00
b9f65c9f50
remove merge marker
2017-06-05 09:26:05 -04:00
9534c725d6
Merge branch 'master' into storageareas
2017-06-05 09:21:37 -04:00
457a3273b1
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-05 09:05:28 -04:00
187bec40ec
Fix #1906
2017-06-05 09:05:17 -04:00
451714a403
Merge branch 'master' into storageareas
2017-06-04 21:42:56 -04:00
7ae0b4a546
handle older versions of ffmpeg
2017-06-03 10:13:39 -04:00
eeefb2c8e2
need previous_pts and dts for both video and audio. I don't think they can share
2017-06-02 16:53:14 -04:00
0ac26277e3
debug, fix deprecations, fix audio
2017-06-02 16:52:52 -04:00
915450de13
spacing and comments
2017-06-01 17:48:52 -04:00
98b3621681
add Debug, and fix logic deleting frames before the appropriate keyframe
2017-05-31 20:44:43 -04:00
a6421a9126
handle deprecations
2017-05-31 20:44:23 -04:00
2eabf13eaf
handle deprecations, make some logic more clear
2017-05-31 20:44:13 -04:00
bc32837e3a
fix braces
2017-05-31 13:55:21 -04:00
0e643f0f93
Merge branch 'master' into storageareas
2017-05-30 11:58:38 -04:00
772df5b41b
add a cast to quiet compiler warning
2017-05-30 10:31:02 -04:00
2e673e49c8
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-05-26 22:20:50 -04:00
90517ed0aa
Merge branch 'master' into add_was_alarmed
2017-05-25 14:01:27 -04:00
a515041e14
Merge branch 'master' into storageareas
2017-05-23 15:17:46 -04:00
5c673d5659
google style
2017-05-23 15:07:50 -04:00
54c9c37b21
Merge ../ZoneMinder.connortechnology
2017-05-20 09:55:06 -04:00
03495e8c23
fix
2017-05-20 09:54:03 -04:00
bb50784ed2
braces
2017-05-20 09:53:35 -04:00
0da03ca5e8
braces/whitespace
2017-05-20 09:41:13 -04:00
b123bd1da3
remove uneccessary zm_packetqueue.h
2017-05-20 09:12:05 -04:00
40993ce401
braces
2017-05-20 09:11:35 -04:00
23633ce30b
braces
2017-05-20 09:06:12 -04:00
a5ee8307d0
Merge ../ZoneMinder.connortechnology
2017-05-20 09:03:57 -04:00
457d7e5c94
code documentation, whitespace
2017-05-20 09:03:51 -04:00
dba947346a
braces
2017-05-20 09:03:04 -04:00
381d44439a
merge SA. braces/whitespace debugging
2017-05-20 09:01:32 -04:00
c24c427409
braces
2017-05-20 08:57:53 -04:00
ab365dc749
braces
2017-05-20 08:53:27 -04:00
62bd134277
whitespace/braces, also ffmpeg deprecation handling
2017-05-20 08:52:24 -04:00
3e426b87d3
init duration to 0 to quieten compiler
2017-05-20 08:35:06 -04:00
1ab8530aed
use enum values to make code more readable. Better error message on event insertion failure
2017-05-20 08:34:46 -04:00
7ecbcd8f12
code documentation
2017-05-20 08:26:55 -04:00
53abc14143
handle ffmpeg deprecations
2017-05-20 08:22:08 -04:00
13273cb50f
rmeove unneeded include
2017-05-19 15:13:42 -04:00
7caeee6bf8
Merge branch 'master' into storageareas
2017-05-19 15:09:44 -04:00
afb450573d
fix
2017-05-19 15:08:04 -04:00
e7ca892efd
merge more differences from SA
2017-05-19 15:07:41 -04:00
91138ba8a1
Merge branch 'master' into storageareas
2017-05-19 14:53:08 -04:00
44e5b6f829
remove redundant code
2017-05-19 14:52:45 -04:00
9e54efdfcf
Merge branch 'master' into storageareas
2017-05-19 14:49:25 -04:00
92c5319fdf
add missing video_file
2017-05-19 14:43:59 -04:00
7c889add76
cleanup sql to load event data. Don't need MonitorName
2017-05-19 14:43:49 -04:00
764c76f98a
add loading the video filename when loading event data
2017-05-19 14:29:08 -04:00
e79d2c5a00
Merge branch 'master' into storageareas
2017-05-19 14:26:28 -04:00
7dccbac78d
clenaup
2017-05-19 14:25:44 -04:00
ccc9f6fdf6
remove redundant code
2017-05-19 14:24:49 -04:00
61204a8b83
Merge branch 'master' into storageareas
2017-05-19 14:11:29 -04:00
41cf0a2458
add back analysis fps
2017-05-19 14:05:24 -04:00
8568c95fbe
handel NULLS in db fields
2017-05-19 14:03:28 -04:00
1e4792e13d
Merge branch 'master' into storageareas
2017-05-19 13:36:23 -04:00
aab08db84b
Merge branch 'master' into storageareas
2017-05-19 13:35:31 -04:00
c4e68f8cfd
fix some spacing problems caused by missing ;
2017-05-19 13:35:13 -04:00
5e2220efa0
add a missing ; at end of line, and remove end of line spaces
2017-05-19 13:30:08 -04:00
3fcca1021d
add missing; and fix spacing
2017-05-19 13:28:34 -04:00
bbb77ab7dd
reorder lines to make diff from master cleaner
2017-05-19 13:27:18 -04:00
96b459a058
Merge branch 'master' into storageareas
2017-05-19 13:19:16 -04:00
6d6b453b82
Google code style/whitespace
2017-05-19 12:57:43 -04:00
e9af81d31c
tabs to spaces
2017-05-19 12:29:03 -04:00
1c9c6441d4
Merge branch 'master' into storageareas
2017-05-19 12:28:07 -04:00
0a8017b780
whitespace/google code style
2017-05-19 12:24:19 -04:00
cb3ee3484a
remove work in progress crap from zm_event
2017-05-18 09:08:31 -04:00
f4224bb88e
Merge branch 'master' into storageareas
2017-05-17 17:47:39 -04:00
eef5e5cd90
Merge branch 'feature-h264-videostorage'
2017-05-16 13:37:24 -04:00
b1f8485969
Fix videostorage ( #1885 )
...
* merge relevant c bits to make h264 recording work
* h264 code requires libavresample and boost
* Need libavresample
2017-05-16 12:04:56 -04:00
c859f7291c
Feature h264 videostorage ( #1882 )
...
* Moved writing of configure options from Controller to Model. Fixes #191 .
* Initial commit for saving events as videos :)
* Add zm_video.cpp to autotools
* Add zm_video.h to autotools
* Search for MP4V2 header file 3 times: mp4v2/mp4v2.h, mp4v2.h, mp4.h
* Fix serve memory leak
* Few minor code improvements
* Added the ability to override preset, tune, profile and few other improvements
* Correctly write SPS & PPS from x264 encoder headers
* Remove unnessecary SPS & PPS writing code
* Imported missing files from master to feature-h264-videostorage
* Audio support including fixes for dts/pts, split on keyframe and update to mkv extension to prevent ffmpeg problems writing rtsp audio to mp4 containter (header problem)
* Updates to make gcc happy
* Add html5 video control to timeline and event to support mkv playback
* Add zm_videostore.cpp to CMakeLists.txt
* Remove Modern Branch for now
* Fix minor bug
* Option handled added in master, removing duplicate declaration
* Add CaptureandRecord from zm_camera.h
* Putting placeholder in for CaptureAndRecord function
* Removed duplicate code and brackets
* add digest auth file for cmake
Conflicts:
src/CMakeLists.txt
* Add web dir back into Makefile.am
Revert "Removed web from SUBDIRS in Makefile.am"
This reverts commit d9bbcdf3a9
2017-05-15 22:02:48 -04:00
d3115219d2
Merge branch 'master' into feature-h264-videostorage
2017-05-15 21:52:58 -04:00
68aea50ca9
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-05-15 16:19:57 -04:00
9bd6c99586
Merge branch 'master' into storageareas
2017-05-15 12:52:35 -04:00
1e45146db8
Merge pull request #1881 from mastertheknife/aarch64_neon
...
Add AArch64 ARM Neon code (complements #1823 )
2017-05-14 07:49:19 -05:00
5df7499da4
Move ARM Neon data prefetches to be after the loads
2017-05-13 19:08:18 +03:00
c66deb564f
Added ARM Neon AArch64 versions of delta
2017-05-13 09:19:13 +03:00
8315be69de
Update zm_image.cpp
...
remove extra }
2017-05-12 18:46:19 -05:00
ec2b6235a0
Added ARM Neon AArch64 version of fastblend
2017-05-12 22:59:08 +03:00
773ad363be
Enable neon (Advanced SIMD) in hwcaps_detect() on AArch64
2017-05-12 22:43:30 +03:00
1ddf4e32cf
Merge branch 'master' into storageareas
2017-05-11 08:55:42 -04:00
0d864b2c6c
Fix delta self-test introduced in #1823 failing ( #1878 )
...
* Fix self-test introduced in #1823 failing and improve logging about the failure
* Remove unnecessary newline added by previous commit
2017-05-11 07:13:04 -04:00
fd44ff4e60
Merge branch 'master' into storageareas
2017-05-10 13:16:08 -04:00
0584454aa8
Fix conflicts in Image::Initialise() caused by merging #1810 and #1823
2017-05-10 17:37:25 +03:00
2c0d322924
remove zmf.cpp to fix merge conflict
2017-05-10 08:07:08 -05:00
c4f471d967
Merge branch 'master' of https://github.com/abishai/ZoneMinder into abishai-master
2017-05-10 08:06:48 -05:00
ccc2cc832f
Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into mastertheknife-armv7_neon
2017-05-10 07:45:58 -05:00
e6c60737e9
Merge pull request #1756 from SteveGilvarry/zmf_goodbye
...
Remove zmf
2017-05-10 07:07:22 -05:00
747583e9f4
Merge pull request #1810 from mastertheknife/ssse3_improvements
...
Minor zm_image SSSE3 improvements
2017-05-10 07:06:33 -05:00
fc52766606
Merge branch 'master' into storageareas
2017-05-08 22:17:37 -04:00
9ac20999b3
rough in
2017-05-05 21:11:23 -04:00
a6a2339eea
play with setting moov flags
2017-05-05 14:25:54 -04:00
35b89b6ef0
When zms hits then end of an event, if in single event mode, reset the frame index to the beginning so it starts again
2017-05-05 14:04:57 -04:00
8251e7ac03
fix uridecode(password) to uridecode(value)
2017-05-05 09:47:15 -04:00
2e8022419b
Delete zmstreamer.cpp again
...
we previously deleted this file with commit 4837585601
2017-05-05 08:17:22 -05:00
2660c8316a
add a test for if the analysis image doesn't exist, fall back to the capture image when streaming.
2017-05-05 09:04:07 -04:00
6827e0412c
white and google style
2017-04-28 10:34:48 -04:00
10dc6b98ca
fix if LIBAVRESAMPLE structure
2017-04-24 11:28:24 -04:00
c4ec01c0d2
fix compile when no libavresample
2017-04-19 14:28:37 -04:00
5246844b10
turn down log level
2017-04-19 14:15:10 -04:00
d2fb4a7874
braces, spacing cleanup. Remove unused variable wasRecording
2017-04-19 10:34:17 -04:00
c3e9b2b177
add some code comments
2017-04-18 14:17:57 -04:00
d53639c2bf
fix braces
2017-04-18 14:17:48 -04:00
d4e0b456c0
Fix HAVE_LIBAVRESAMPLE tests so that the build works without it
2017-04-18 10:49:27 -04:00
273229858f
Merge branch 'master' into storageareas
2017-04-16 11:26:18 -04:00
71e6735b60
Neon32 functions now work on 64 bytes at a time. This results in 4-6x performance increase over standard functions
...
Memory allocations and image size requirements changed to be as needed for 64 byte alignment.
Self-test code for Blend modified accordingly and added Self-test for the delta functions.
2017-04-16 10:57:37 +03:00
8c298b96d0
Merge pull request #1820 from SteveGilvarry/Remove_arg_r
...
Remove zmc -r argument as it does not seem to be implemented.
2017-04-15 07:17:56 -05:00
6b0f587725
invert timestamp_on_capture condition
2017-04-13 15:51:50 -05:00
83219d3e34
define av_frame_free to av_freep on older ffmpeg. Undo c++11 requirements.
2017-04-13 09:47:19 -04:00
d1f04a60f9
fix errors calculating dts
2017-04-12 16:16:37 -04:00
d039227f79
Merge branch 'master' into storageareas
2017-04-12 13:51:10 -04:00
51d5bfc8d5
introduce a helper function to print out a timeval
2017-04-12 13:40:38 -04:00
ecb57f8f04
change bool recording to a timeval.
2017-04-12 13:40:17 -04:00
575b3138de
change it from a queue to a list. Implement a clearQueue that keeps some frames, and a function clear out unwanted frames
2017-04-12 13:39:47 -04:00
a0b57cedeb
change bool recording to a timeval. and add GetPreEventCount
2017-04-12 13:39:12 -04:00
e3d3fc3411
change bool recording to a timeval.
2017-04-12 13:38:56 -04:00
59c85c1fbb
change bool recording to a timeval.
2017-04-12 13:38:39 -04:00
8efeb41f7d
use new clear_unwanted_packets and a clearQueue version that keeps the approprate # of frames
2017-04-12 13:38:12 -04:00
954c863ad8
add a non-const version of StartTime() which we need in order to assign to video_data->recording
2017-04-12 13:36:49 -04:00
7e920eb5d3
add a non-const version of StartTime() which we need in order to assign to video_data->recording
2017-04-12 13:36:39 -04:00
669a23c408
change type of width and height to unsigned int and recording from bool to timeval
2017-04-12 13:35:07 -04:00
bdb6dd63a3
change type of width and height to unsigned int and recording from bool to timeval
2017-04-12 13:32:22 -04:00
eb390c323e
Merge branch 'storageareas' into ffmpeg_321
2017-04-11 11:14:23 -04:00
161aaac3f2
cleanup swsresample stuff. resampling now works
2017-04-11 10:39:43 -04:00
a2a823e3ec
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-04-11 08:54:54 -04:00
9291c154a1
Merge branch 'split_monitor_stream' into storageareas
2017-04-10 21:58:01 -04:00
42e94d1a7c
contains the MonitorStream class
2017-04-10 21:57:31 -04:00
620797ac18
replace swresample with libavresample
2017-04-10 21:54:23 -04:00
2220b04203
need to include zm_monitorstream.h now
2017-04-10 21:52:29 -04:00
766925d9a7
Split MonitorStream into it's own files.
2017-04-10 21:51:18 -04:00
48d658790a
Merge branch 'storageareas' into optimisations
2017-04-09 17:36:24 -04:00
4215f227da
Merge branch 'mastertheknife-ssse3_improvements' into storageareas
2017-04-07 13:43:09 -04:00
6ec340d525
Merge branch 'ssse3_improvements' of https://github.com/mastertheknife/ZoneMinder into mastertheknife-ssse3_improvements
2017-04-07 13:38:50 -04:00
68ab2cb756
Merge pull request #1837 from DarkDeepBlue/fix-format-string-local-cam
...
zm_local_camera.cpp: Improve format strings
2017-04-06 08:54:20 -04:00
6a9819e16b
whitespace, comments
2017-04-05 16:10:21 -04:00
452e9571ee
add a different size warning
2017-04-05 16:08:29 -04:00
15e69fc817
fix . to ->
2017-04-05 10:39:38 -04:00
1dbf599f10
add a cast to get rid of build warning
2017-04-05 10:36:44 -04:00
1f3eecbd6c
change how opkt.pts/dts are calculated by using the diff since the last input packet instead of the diff since the beginning of stream. This should allow us to handle input pts/dts wrapping.
2017-04-04 15:15:37 -04:00
b609b9ad4c
Merge pull request #1826 from connortechnology/uri_decode_in_zms
...
Uri decode in zms
2017-04-03 20:13:30 -05:00
e70c7fa1ef
whitespace and comments
2017-03-31 23:34:58 -04:00
30455feef7
code style
2017-03-31 11:12:52 -04:00
9c495b07dd
code style, whitespace, comments
2017-03-31 11:12:42 -04:00
26dfe45ec6
delete the videostore on camera delete so that the .mp4 gets written to disk
2017-03-31 11:06:15 -04:00
f2dcd18297
Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into storageareas
2017-03-30 13:46:30 -04:00
5f6332f313
Fixed the assembly in hwcaps_detect() to compile with -fpic & -fPIC and added SSE4.1, SSE4.2 and AVX detection
2017-03-30 20:35:31 +03:00
1d146b112a
remark out some code that detects when the pts is < last_pts. The rest isn't implemented yet so it's bogus
2017-03-30 13:04:54 -04:00
8b7acb68a3
fix password and add debug
2017-03-29 20:07:58 -04:00
184eb507a7
zm_local_camera.cpp: Improve format strings
...
This avoids printing '0x0' as char and hence terminating the output too
early.
2017-03-29 12:45:44 +02:00
7162c62d26
Implemented a fix to get the Neon code to compile successfully with GCC < 6.0
2017-03-25 21:49:15 +03:00
5800598666
put back code that got merged out
2017-03-24 13:43:56 -04:00
a33a8402ef
Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into neon
...
Conflicts:
src/zmf.cpp
src/zms.cpp
2017-03-24 12:14:16 -04:00
3a8a04c213
Merge branch 'master' into feature-h264-videostorage
2017-03-22 09:02:02 -04:00
3431cf7732
Reduce code duplication in the SSSE3 functions: a single function for delta and a single function for RGB32->grayscale convert
2017-03-22 11:38:15 +02:00
df5a238857
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-03-20 15:14:50 -04:00
0a1b2eab01
Merge branch 'uri_decode_in_zms' into storageareas
2017-03-20 15:13:19 -04:00
f5dc896a45
missed one case
2017-03-20 15:12:23 -04:00
7b8ff44163
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-03-20 15:04:54 -04:00
816b0a9e01
add getsockopt test
2017-03-20 15:04:05 -04:00
a546c9e37f
merge uri_decode in zms
2017-03-20 12:00:14 -04:00
9f30ccfa75
Use new UriDecode function to decode username and password
2017-03-20 11:16:39 -04:00
3b15ba91d1
Rough in a CURL based UriDecode
2017-03-20 11:16:21 -04:00
ca99d84995
Only include sys/auxv.h on ARM systems. That way the code can compile with glibc < 2.16
2017-03-20 15:12:28 +02:00
8b593b701b
Fixed hwcaps_detect() failing to compile on x86-64
2017-03-19 15:11:06 +02:00
29885135a6
Corrected issues in last two ARM Neon commits
2017-03-19 13:39:24 +02:00
510f65c414
Added ARM Neon (AArch32) FastBlend function
2017-03-19 13:31:44 +02:00
c5c9b52d18
Added ARM Neon (AArch32) Delta functions for 32bit color and 8bit grayscale
2017-03-19 13:02:42 +02:00
e02e033cc8
Renamed ssedetect() to hwcaps_detect() and added ARM Neon and AVX2 detection
2017-03-19 02:05:01 +02:00
e5b18ee213
Remove zmc -r argument as it does not seem to be implemented.
2017-03-18 23:25:14 +11:00
c24853ad11
Merge pull request #1806 from adam900710/compile_fix
...
ZoneMinder: Rename public enum CHAR_WIDTH/CHAR_HEIGHT to avoid conflicts
2017-03-17 09:42:15 -04:00
b041e299fc
Merge branch 'adam900710-compile_fix' into storageareas
2017-03-17 09:41:42 -04:00
654282d82e
fix merge
2017-03-17 09:41:04 -04:00
d9c665b021
Merge branch 'fix_crash_with_invalid_zones' into storageareas
2017-03-17 09:35:11 -04:00
6a447194eb
Fix zmc crashing when zones are no good bby decreasing n_zone before continuing
2017-03-16 10:55:13 -04:00
f7fcab24c4
Fixed a mistake in recent commit e7a681b8ff
2017-03-14 22:46:36 +02:00
f30192e5da
Use standard memcpy() on x86-64, as it behaves similar performs the equal or better
2017-03-14 22:41:35 +02:00
67f7ad40ae
Removed SSSE3 deinterlacing functions, as they were typically equal or slower than the standard code (when compiled with -O2 or better)
...
The function is too complicated to be vectorized efficiently
2017-03-14 22:36:26 +02:00
e7a681b8ff
Added BGRA, ARGB and ABGR variants of SSSE3 32bit color to grayscale conversion and made the code actually use them all
2017-03-14 22:29:55 +02:00
20604c2150
SSSE3 rgba->gray8 convert function now uses less instructions and is 10-20% faster
2017-03-14 16:54:00 +02:00
844b4bb5ee
SSSE3 delta functions now use less instructions and are 5-10% faster
2017-03-14 12:17:01 +02:00
0b9853e1d4
ZoneMinder: Rename public enum CHAR_WIDTH/CHAR_HEIGHT to avoid conflicts
...
CHAR_WIDTH is defined by limits.h, and class Image redefines it to 6,
which causes gcc6, clang, gcc5 to complain about it.
Fix by adding ZM_ prefix to CHAR_WIDTH and CHAR_HEIGHT, so it can be
compiled.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
2017-03-12 22:00:46 +08:00
3f7583ebda
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-03-06 16:22:25 -05:00
e723b6dbef
Must cast codec
2017-02-21 16:28:53 -05:00
0880412e7f
Merge branch 'master' into feature-h264-videostorage
2017-02-21 16:04:27 -05:00
34d462a5d5
Merge branch 'zm_packet' into ffmpeg_321
2017-02-18 15:23:21 -05:00
f19b3d5505
create zm_packet
2017-02-18 15:22:56 -05:00
a97941edd3
change level from error to debug on message about not supporting non-FLTP
2017-02-16 13:30:34 -05:00
d135216ac7
Merge branch 'master' into storageareas
2017-02-15 09:30:35 -05:00
808d070414
don't copy smCodes, just get a pointer to it.
2017-02-14 11:29:43 -05:00
4ca2bcacde
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-02-13 17:02:59 -05:00
d5bb6f3210
remove line that causes endless reading when doing single image mode
2017-02-11 09:57:36 -05:00
74dd8ab027
make clang happy take two
2017-02-06 09:57:22 +03:00
aae4a1f83b
remove extraneous setting of NULL to videowriter which is already NULL
2017-02-04 11:20:21 -05:00
8d5a8f5512
make clang happy
2017-02-03 14:53:53 +03:00
f73bf0aee0
add a cast to fix compilation with clang
2017-02-02 12:43:13 -05:00
1102f449aa
don't do extra copy of classString
2017-02-02 09:22:13 -05:00
1687217d18
switch to POSIX basename()
2017-01-31 11:10:25 +03:00
97380f009b
implement platform-agnostic comparison without abs()
2017-01-31 10:42:57 +03:00
7ab6818fa0
Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize
2017-01-25 17:14:30 -05:00
41b6369c36
Merge branch 'master' into feature-h264-videostorage
2017-01-25 09:46:06 -05:00
61827fec0c
remove redundant mkdir eventdir.
2017-01-18 09:31:08 -05:00
7116d66500
use the correct pointer casts
2017-01-16 21:57:21 -05:00
1f3644f6bd
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-01-16 21:14:39 -05:00
19bc79a5ec
move nRet into the block where it is used. Add a comment.
2017-01-16 21:11:28 -05:00
f6d1707382
fix event insert
2017-01-16 21:08:13 -05:00
2f3ebd80da
Remove zmf, die..die..die
2017-01-16 13:20:05 -08:00
5833196a84
packpack - change error code handling
2017-01-16 08:36:46 -06:00
c5ad62b9fc
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-01-15 14:24:58 -05:00
29acad163c
Add some casts to quiet warnings. The warnings happen because we are doing arithmetic on pointers.
2017-01-15 14:24:50 -05:00
b7ee64ff41
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-01-15 13:35:45 -05:00
899b1b82b9
Merge branch 'filter_by_runstate' into storageareas
2017-01-14 17:07:20 -05:00
242e5a56d8
rough in the ability to filter on RunState
2017-01-14 16:55:28 -05:00
babe4f07fb
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-01-14 10:53:49 -05:00
21c1e1d26f
add a call to av_interleaved_write_Frame to clear out the queues in the destructor
2017-01-13 14:37:18 -05:00
251264ac92
bump ffmpeg version required to use codecpar
2017-01-11 14:31:30 -05:00
7f059b750f
fix whitespacing causing a warning when compiling. In this case braces are not neccessary.
2017-01-11 14:25:46 -05:00
23b40da598
fix whitespacing causing a warning when compiling. In this case braces are not neccessary.
2017-01-11 14:25:12 -05:00
8653822bff
cleanup av_packet_unref/free_packet by using our zm_av_packet_unref
2017-01-11 14:22:37 -05:00
87daba346b
fix else behaviour by adding braces
2017-01-11 14:18:56 -05:00
0d5910644e
whitespace and braces fixes. Also add some braces to fixup a compiler error about the else not doing what it should be.
2017-01-11 14:18:11 -05:00
5d03e9f50e
Merge branch 'fix_1743_Edimax' into storageareas
2017-01-11 10:34:08 -05:00
c0e929f136
change regexp to handle quotes in the content-type line. This is needed for edimax cameras
2017-01-11 09:11:27 -05:00
8ae02b9ac0
use a FrameType enum instead of string comparisons
2017-01-08 16:53:29 -05:00
8f3e40d7af
add a const array of char * strings for the frame types so that we can make better use of the FrameType enum for more efficient code
2017-01-08 16:53:15 -05:00
dccd1e9732
fix
2017-01-05 13:54:34 -05:00
71ad08613e
fix
2017-01-05 11:30:01 -05:00
d1ed472db0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-01-05 10:09:11 -05:00
d5ad757116
Merge branch 'master' into feature-h264-videostorage
2017-01-02 10:00:02 -05:00
Isaac Connor
Isaac Connor
Isaac Connor
Andrew Bauer
Isaac Connor
ralimi
abishai
Kfir Itzhak
Andrew Bauer
Michael Schupikov
SteveGilvarry
Qu Wenruo
abishai