Commit Graph

5687 Commits

Author SHA1 Message Date
Isaac Connor 6d4d05184c fix typo 2016-03-23 09:49:38 -04:00
Luke Cousins 2ede18a614 Minor improvements to documentation 2016-03-21 22:47:45 +00:00
Andrew Bauer 671326f686 Merge pull request #1347 from jburgess777/tenvis
ONVIF: Tenvis TH661 support
2016-03-21 12:47:13 -05:00
Isaac Connor d3558c5688 Merge pull request #1323 from knnniggett/zmfilter
fix missing Net::SFTP::Foreign::debug warning
2016-03-21 10:47:50 -04:00
Isaac Connor 06943bae82 Merge pull request #1353 from jburgess777/ffmpeg-option-logging
Add more logging to diagnose problems with applying ffmpeg options
2016-03-21 10:44:06 -04:00
Isaac Connor 0cb2ad4b01 Merge pull request #1352 from jburgess777/ffmpeg-options-help-typos
Fix spelling in ffmpeg options help page
2016-03-21 10:43:16 -04:00
Andrew Bauer cf35da07b5 Merge pull request #1349 from altaroca/onvif-discovery-1346
Improved Onvif discovery #1346
2016-03-21 08:47:23 -05:00
Jon Burgess bfd846bbff Add more logging to diagnose problems with applying ffmpeg options 2016-03-20 21:44:58 +00:00
Jon Burgess 9c98ccbb75 Fix spelling in ffmpeg options help: s/verbosiy/verbosity/ 2016-03-20 16:13:53 +00:00
Jon Burgess 020731a89e Fix typo in ffmpeg options help: s/passwd/passed/ 2016-03-20 16:10:49 +00:00
Steve Gilvarry ecb8c48b3b Merge pull request #1344 from jburgess777/spelling
Fix spelling of 'environment' in README.Centos7
2016-03-20 09:05:47 +11:00
Steve Gilvarry e85c56d005 Merge pull request #1348 from jburgess777/spelling2
Doc reference to Astericks was presumably meant to be Asterisk.
2016-03-20 09:05:07 +11:00
Jan M. Hochstein 39053f9325 WSDiscovery version changed from 1.1 to 1.0 2016-03-19 18:36:12 +01:00
Jon Burgess 6fd718e2e6 ONVIF: Fix hash reference mixups which broke 1.1 detection
With these changes the script now detects my camera during the
1.1 scan and ignores the duplicate 1.2 response.

$ ~/zmonvif-probe.git.pl probe
http://192.168.1.246:8080/onvif/devices, 1.1, (Profile='Streaming', model='C6F0SeZ0N0P0L0', name='IPCAM', location/country='china')
2016-03-19 17:28:39 +00:00
Jon Burgess b11f3bce53 Assume this was meant to be Asterisk, not Astericks. 2016-03-19 15:25:17 +00:00
Jon Burgess 909c23c38b ONVIF: Make GetStreamUri try both RTP_unicast and RTP-Unicast
The specification gives conflicting values for the unicast stream
type in different parts of the document:

http://www.onvif.org/onvif/ver10/media/wsdl/media.wsdl#op.GetStreamUri

Description has: StreamType = "RTP_unicast"

Input has: enum { 'RTP-Unicast', 'RTP-Multicast' }

The Tenvis TH661 only accepts RTP-Unicast but the original code was
using RTP_unicast. Try both and take the result of the first one
which works.
2016-03-19 14:50:44 +00:00
Jon Burgess ed7e3e47b7 Add more checking around xaddr parsing 2016-03-19 14:15:51 +00:00
Jon Burgess 16cf1b6245 Detect IP address in URLs like http://ip:port/
This if for devices like the Tenvis TH661 which responds with:

http://192.168.1.246:8080/onvif/devices
2016-03-19 13:31:33 +00:00
Jon Burgess 06e04127d6 Fix spelling in other README files as well 2016-03-18 23:27:43 +00:00
Jon Burgess 94057a94ff Fix spelling of 'environment' 2016-03-18 22:42:34 +00:00
Andrew Bauer fe46785e94 Update redhat.rst 2016-03-15 07:33:40 -05:00
Andrew Bauer 68a5e78efc Update redhat.rst 2016-03-15 07:30:31 -05:00
Andrew Bauer dcdb879637 Update redhat.rst 2016-03-15 07:24:15 -05:00
Andrew Bauer 4581379d45 Update redhat.rst
minor edits
2016-03-15 07:21:34 -05:00
Andrew Bauer 8f3cdef44c Merge pull request #1312 from knnniggett/readthedocs
add redhat instructions to readthedocs
2016-03-15 07:08:43 -05:00
Andrew Bauer 51a16b73c4 Merge pull request #1338 from altaroca/onvif-proxies-1320
Added Proxies for WSNotification and ONVIF-Analytics
2016-03-13 17:28:53 -05:00
Matt N 0af83ed7f3 Change README documentation link to readthedocs
The wiki just ends up linking there
2016-03-13 15:19:04 -07:00
Jan M. Hochstein 2c0c014535 Added Proxies for WSNotification and ONVIF-Analytics 2016-03-13 10:16:20 +01:00
Andrew Bauer f55c03e9ea Merge pull request #1336 from pliablepixels/1335-api-states-security
api security enhancements issue #1335
2016-03-12 09:09:38 -06:00
arjunrc 8a47241e18 address issue #1335 2016-03-12 08:07:25 -05:00
Kyle Johnson 5b2d194af2 Merge pull request #1330 from knnniggett/freebsd
add freeBSD cmake target distro
2016-03-11 14:58:43 -07:00
Andrew Bauer 16992a44cb add ZM_PERL_MM_PARMS 2016-03-11 15:56:29 -06:00
Andrew Bauer 2cae5d6e7f Merge pull request #1333 from ZoneMinder/quick-fix-perl-path
Quick fix perl path
2016-03-11 15:43:48 -06:00
Kyle Johnson 4e1af516d7 Don't output sudo test cmd to /dev/null. Other tests aren't, and info us useful. 2016-03-11 14:29:48 -07:00
Kyle Johnson b9085cea64 Fix issue where programs are installed in unexpected paths.
For example, on freebsd, sudo is in /usr/local/bin, and as things
were pre-this commit, sudo wasn't being found.
2016-03-11 14:28:16 -07:00
Andrew Bauer b1d3be2cfc add freeBSD cmake target distro 2016-03-11 07:38:29 -06:00
Kyle Johnson 8cd7731c4a Merge pull request #1329 from knnniggett/execinfo
change linker flag to "-lexecinfo"
2016-03-10 14:16:25 -07:00
Andrew Bauer 1d478a3b1c change linker flag to "-lexecinfo" 2016-03-10 15:00:21 -06:00
Kyle Johnson 46b40458eb Merge pull request #1328 from knnniggett/pure_install
use make "-f" parameter instead of "--makefile"
2016-03-10 13:21:24 -07:00
Andrew Bauer facae6cb0d use make "-f" parameter instead of "--makefile" 2016-03-10 13:58:41 -06:00
Andrew Bauer 4606d2fbca Update zmtrigger.pl.in
mention the %Q placholder when using showtext
2016-03-10 10:13:38 -06:00
Andrew Bauer a0f81b2315 Merge pull request #1327 from ZoneMinder/add_onvif_deps
Add onvif deps
2016-03-09 12:04:22 -06:00
Isaac Connor d51d95ce1e Merge pull request #1326 from knnniggett/fixGroupSaveBtn
disable save button when nothing slected. fixes #1322
2016-03-09 11:43:13 -05:00
Andrew Bauer 77f7a3642c remove check for "selected" property 2016-03-09 10:34:06 -06:00
Isaac Connor 313f46dceb add zmtelemetry.pl to autotools build 2016-03-09 11:26:10 -05:00
Isaac Connor 1c481a3dbf add zmtelemetry.pl to autotools build 2016-03-09 11:25:16 -05:00
Isaac Connor ee0c134a9b need spaces at beginning of lien 2016-03-09 11:18:27 -05:00
Isaac Connor 740dc12f7c remove extra comma 2016-03-09 11:17:50 -05:00
Andrew Bauer 3280aff876 disable save button when nothing slected. fixes #1322 2016-03-09 09:43:44 -06:00
Isaac Connor 094b041c43 There must be spaces before the comma 2016-03-08 16:06:16 -05:00