305a954ee2
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
2019-06-25 22:20:19 -04:00
0dbe48fb31
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2019-06-25 22:19:53 -04:00
6390f99e2f
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-06-25 22:19:27 -04:00
2a65b339c1
init hw_pix_fmt in constructor
2019-06-25 22:19:09 -04:00
86e8b58561
move hw_device_ctx under ifdef for HWCONTEXT_H
2019-06-25 22:06:00 -04:00
cf5cffa876
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-06-25 21:47:45 -04:00
7389bbcb25
better debug in selecting hw_format, add CUDA, add setting device for hwaccel
2019-06-25 21:47:19 -04:00
a44631a59d
rough in support for ffmpeg 3.4
2019-06-25 16:35:07 -04:00
c290170878
Merge branch 'master' of github.com:connortechnology/ZoneMinder
2019-06-25 16:32:38 -04:00
5ab4414b11
Only include hwaccel support if LIBAVUTIL_HWCONTEXT_H is deifned
2019-06-25 15:58:55 -04:00
84b5e505aa
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-06-25 15:48:04 -04:00
679b6b1b2d
remove old qsv code
2019-06-25 15:47:23 -04:00
e4d9973c66
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-06-25 15:37:07 -04:00
46f3aabc25
Merge branch 'hwdecode' into storageareas
2019-06-25 15:35:56 -04:00
0103df9781
bump verison
2019-06-25 15:35:09 -04:00
a28f17653f
Add DecoderHWAccel fields to Monitor
2019-06-25 15:34:45 -04:00
86c4051c44
handle zm_receive_frame returning AVERROR instead of boolean
2019-06-25 15:34:36 -04:00
434bbce954
Add loading decoder_hwaccel in Monitor
2019-06-25 15:34:17 -04:00
d0abd16494
add passing hwaccel name and device. use av_make_error_string(ret).c_str() to reduce code and increase consistency
2019-06-25 15:34:01 -04:00
cf7f3e8a88
add passing hwaccel name and device. use av_make_error_string(ret).c_str() to reduce code and increase consistency
2019-06-25 15:33:54 -04:00
6a87d9a875
change zm_receive_frame to return AVERROR instead of boolean
2019-06-25 15:32:47 -04:00
19af25bf1a
add DecoderHWAccel fields to Monitors
2019-06-25 15:29:46 -04:00
2cbcaeebbc
clean out old hwdecode stuff. refactor common code out
2019-06-25 14:11:59 -04:00
bfb7238edb
Merge branch 'master' into hwdecode
2019-06-25 09:09:57 -04:00
c3135accbb
Make events close on a section length time boundary only if event_close_mode == CLOSE_TIME. When an alarm happens in event_close_mode==ALARM, close the continuous event regardless of the # of pre-event frames in the event. Add some debugging
2019-06-24 21:11:52 -04:00
246b4cb9d1
working hwdecode
2019-06-24 17:22:59 -04:00
529f0b55ef
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-06-24 13:13:57 -04:00
2d80283844
simplify some logic in Analyze and prevent segfault when we close continuous event to start alarm event
2019-06-24 13:13:46 -04:00
8cf7563ce4
fix merge
2019-06-24 12:00:19 -04:00
148a48a861
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
2019-06-24 11:59:08 -04:00
ee19322e11
update do_debian_package from storageareas
2019-06-24 11:57:52 -04:00
7914583a9e
Add support for specifying PPA
2019-06-24 11:56:59 -04:00
1815bf18a9
Add support for specifying PPA
2019-06-24 11:55:38 -04:00
46c19c7efb
fix for zone overlay scaling issues in montage ( #2643 )
...
* remove extra px in svg tag
* add js method to track liveStream img size for zones
* switch to using SVG scaling to deal with zone polygons
* update jsdoc for eslint
* fix blank lines eslint issue
2019-06-24 11:45:40 -04:00
9a353d0b6d
don't set frame size
2019-06-24 11:44:21 -04:00
44e4d93445
Merge branch 'master' into storageareas
2019-06-24 11:35:36 -04:00
6ed0074077
End continuous events on alarm ( #2644 )
...
* Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it
* Spacing, google code style and tabs to spaces
* add update script to add MinSectionLength
* Add min_section_length to enforce a minimum event length when closing continuous events on alarm
2019-06-24 11:29:00 -04:00
299f994506
Fix zmcrypt message ( #2645 )
...
* added more clarity on zm_crypt authentication errors
* fixed variable name
2019-06-24 11:28:32 -04:00
dab9544845
Revert audio sync fixes ( #2646 )
...
* Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it
* Spacing, google code style and tabs to spaces
* Revert the work I did to srt packets by dts after changing their time_base. It doesn't work. Instead since dts doesn't actually matter to playback, only ffmpeg storing, munge it to whatever is neccessary to make ffmpeg happy.
2019-06-24 11:27:47 -04:00
9713d908fb
Spacing, google code style and tabs to spaces
2019-06-24 10:28:11 -04:00
73b5d506b4
Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it
2019-06-24 09:33:54 -04:00
82672d9b86
stop bcrypt files from installing with zm
2019-06-23 13:20:08 -05:00
00183b535a
rename bcrypt to libbcrypt to reflect name of the project
2019-06-23 12:56:04 -05:00
645d13c752
bump rpm specfile to 1.33.9
2019-06-23 12:16:15 -05:00
8b37c0e9b0
remove bcrypt & jwt-cpp as submodules, bring in statically under src
2019-06-23 12:12:12 -05:00
46032385fe
fix viewport on mobile. Fix duplicated css when selected css is base
2019-06-22 14:10:55 -04:00
38bcdbbffe
ONly close session if we opened it in generateAuthHash, only try to validate auth hash if it is set in the session
2019-06-21 18:04:39 -04:00
85b9b045cc
Copy Profile Token to ControlDevice for use with Netcat PTZ script
2019-06-21 12:42:26 -04:00
60618d5998
Fix hour subtraction in getAuthUser to actually subtract an hour
2019-06-21 11:45:33 -04:00
ad1df8f80a
log the response if command fails, and add missing uthentication sections
2019-06-21 11:40:46 -04:00
Isaac Connor
Isaac Connor
Isaac Connor
Tom Hodder
Pliable Pixels
Andrew Bauer