Commit Graph

37 Commits

Author SHA1 Message Date
Matthew Skinner
cb3496f967
[ipcamera] Fix multiple mjpeg issues and allow stream to stay alive (#11921)
* Fix for a camera that has a space in boundary
* Fixes to ipcamera.mjpeg

Signed-off-by: Matthew Skinner <matt@pcmus.com>
2022-01-09 13:42:16 +01:00
Hilbrand Bouwkamp
da59cdd255
Update license headers to 2022 (#11973)
Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
2022-01-06 18:14:47 +01:00
Christoph Weitkamp
167f8ebc49
Avoid UnsupportedEncodingException & use const from StandardCharsets (#11948)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2022-01-03 16:05:08 +01:00
Marcel
0b79d87d9f
Fix pom http://maven.apache.org/xsd/maven-v4_0_0.xsd entries (#11850)
* Fix pom http://maven.apache.org/xsd/maven-v4_0_0.xsd entries
* Fix http://maven.apache.org/maven-v4_0_0.xsd entries in pom.xml

Signed-off-by: Marcel Verpaalen <marcel@verpaalen.com>
2021-12-24 11:36:42 +01:00
Kai Kreuzer
48746f5e3f Apply spotless
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2021-12-20 09:07:55 +01:00
openhab-bot
6dc031e6cf [unleash-maven-plugin] Preparation for next development cycle. 2021-12-20 00:30:46 +00:00
Wouter Born
07a1976c81
Add default translations for binding add-ons (#11760)
* Add default translations for binding add-ons

This makes the texts used by these add-ons translatable with Crowdin.

To keep the PR simple, it only adds default translations for add-ons which do not yet have any default translations properties file.
We can do follow up PRs for adding missing key/values to add-ons that already have these files or to remove duplications.

There are several add-ons in this PR that do have non-English translation files, so I'll upload those to Crowdin when the PR is merged.

Signed-off-by: Wouter Born <github@maindrain.net>
2021-12-15 18:40:21 +01:00
Matthew Skinner
6077ce3c44
[ipcamera] Add new channel lastEventData for detailed extra data on alarms (#11748)
* Add new channel
* Last Event Data channel finished.
* Remove info logging.
* Fix bugs
* Fix ONVIF wont use different ports in xaddr paths.

Signed-off-by: Matthew Skinner <matt@pcmus.com>
2021-12-12 09:08:53 +01:00
Wouter Born
589400e223
Fix/suppress PMD CompareObjectsWithEquals findings (#11476)
Newer PMD versions discover more CompareObjectsWithEquals findings.

Related to https://github.com/openhab/static-code-analysis/pull/423

Signed-off-by: Wouter Born <github@maindrain.net>
2021-11-02 10:43:53 +01:00
Matthew Skinner
73b4dbe14f
[ipcamera] Fix Hikvision digest stopping ipcamera.mjpeg (#11457)
* Stop hik logging 401 with digest.

Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Improve and fix generic cams


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Stop dahua IntelliFrame logging


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Catch IllegalStateException


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Trial reusing channels.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Tidy up


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* cleanup 2


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Cleanup 3


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Disable checking connection with event stream.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Bug fix


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* more cleanup


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* more cleanup

Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Reduce logging to only whats needed.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* fix offline detection.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* fixes to ipcamera.mjpeg


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* reverse some connection checks


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Fix Hikvision Digest stops ipcamera.mjpeg


Signed-off-by: Matthew Skinner <matt@pcmus.com>
2021-10-30 18:00:34 +02:00
Matthew Skinner
04ba8d3e5e
[ipcamera] Improvements and fix 503 errors go to offline with Hik (#11419)
* Stop hik logging 401 with digest.

Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Improve and fix generic cams


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Stop dahua IntelliFrame logging


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Catch IllegalStateException


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Trial reusing channels.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Tidy up


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* cleanup 2


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Cleanup 3


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Disable checking connection with event stream.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Bug fix


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* more cleanup


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* more cleanup

Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Reduce logging to only whats needed.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* fix offline detection.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* fixes to ipcamera.mjpeg


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* reverse some connection checks


Signed-off-by: Matthew Skinner <matt@pcmus.com>
2021-10-24 11:36:20 +02:00
Matthew Skinner
9e190e8667
[ipcamera] Fix several issues and some improvements (#11300)
* Fixes an issue now that the binding is not polling the snapshot anymore where the jpg could return an old image from cache.
* Fixes an issue that could be caused if you spammed the refresh key whilst watching ipcamera.mjpeg
* Improvements in stopping the servlet and stopping any open streams if the pause button is pressed on a camera thing.
* Reduces memory, thread and open file descriptor resource use.
* Fixes empty passwords create bad log output for logged ffmpeg commands.
* Fix for INSTAR cameras that created a WARN about bad user/pass when setting up the alarm server.

Closes #11301

Signed-off-by: Matthew Skinner <matt@pcmus.com>
2021-10-10 10:12:18 +02:00
Matthew Skinner
fd646a59bd
[ipcamera] Move to using port 8080 servlet not Netty. (#11160)
* Move to using 8080 servlet not Netty.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Add some mjpeg features to servlet.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Fix autofps bug


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Reached feature parity.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Cleanup serverPort from cameras.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* bug fixes.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Refactor groups.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Bug fixes to groups


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Update readme


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Cleanup


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* clean up 2.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* bug fixes.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Improve snapshot fetching for autofps.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Make functions synchronized.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Fixes.

Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Abstract servlets


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Fix NPE warnings


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Remove ability to go child or parent folders.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* autofps improvement


Signed-off-by: Matthew Skinner <matt@pcmus.com>
2021-09-21 19:39:46 +02:00
Matthew Skinner
333e7d2ef2
Fix IndexOutOfBoundsException and remove Sleep. (#11089)
Signed-off-by: Matthew Skinner <matt@pcmus.com>
2021-08-11 12:02:19 +02:00
Matthew Skinner
91879336e3
[ipcamera] Improve FFmpeg motion detection to support wider FPS range (#11067)
* Fix urls are null until binding restarts.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Change to using port config.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* automate the ffmpeg output folder to follow the UID.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* spotless fixes.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Update readme.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* change to using the userdata folder.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* change to better field description.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Add advanced.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Add link to docs.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* improve readme.

Signed-off-by: Matthew Skinner <matt@pcmus.com>

* improve example path in readme.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Update bundles/org.openhab.binding.ipcamera/README.md

Cut and paste bandit strikes again. thanks.

Signed-off-by: Matthew Skinner <matt@pcmus.com>

Co-authored-by: Fabian Wolter <github@fabian-wolter.de>

* Change to using ipcamera as folder loc.

Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Improve Ffmpeg motion and refactor to remove compiler warnings.

Signed-off-by: Matthew Skinner <matt@pcmus.com>

Co-authored-by: Fabian Wolter <github@fabian-wolter.de>
2021-08-01 20:06:28 +02:00
Kai Kreuzer
bebab9ce29 applied spotless
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2021-06-27 23:25:35 +02:00
jenkins
8c5c81e256 [unleash-maven-plugin] Preparation for next development cycle. 2021-06-27 17:35:01 +00:00
lolodomo
cba49df16a
Added support for publishing ChannelDescriptionChangedEvents (#10896)
Pack 2

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
2021-06-22 10:38:15 +02:00
Matthew Skinner
f263c13c6b
[ipcamera] Fix null URL channels and fix multiple cameras use the same ffmpeg output folder. (#10846)
* Fix urls are null until binding restarts.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Change to using port config.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* automate the ffmpeg output folder to follow the UID.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* spotless fixes.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Update readme.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* change to using the userdata folder.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* change to better field description.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Add advanced.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Add link to docs.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* improve readme.

Signed-off-by: Matthew Skinner <matt@pcmus.com>

* improve example path in readme.


Signed-off-by: Matthew Skinner <matt@pcmus.com>

* Update bundles/org.openhab.binding.ipcamera/README.md

Cut and paste bandit strikes again. thanks.

Signed-off-by: Matthew Skinner <matt@pcmus.com>

Co-authored-by: Fabian Wolter <github@fabian-wolter.de>

* Change to using ipcamera as folder loc.

Signed-off-by: Matthew Skinner <matt@pcmus.com>

Co-authored-by: Fabian Wolter <github@fabian-wolter.de>
2021-06-15 23:50:00 +02:00
Wouter Born
aaeddc8119
Update Netty dependencies to 4.1.63.Final (#10606)
Signed-off-by: Wouter Born <github@maindrain.net>
2021-04-28 12:22:11 +02:00
Matthew Skinner
ec8f411774
Fix warning at the wrong time. (#10351)
Signed-off-by: Matthew Skinner <matt@pcmus.com>
2021-03-31 21:48:19 +02:00
Matthew Skinner
16fba31556
[ipcamera] Improve Hikvision alarm reliability (#10319)
Signed-off-by: Matthew Skinner <matt@pcmus.com>
2021-03-15 23:58:11 +01:00
Matthew Skinner
6b624f0e1c
[ipcamera] Improve Dahua alarms (#10078)
Signed-off-by: Matthew Skinner <matt@pcmus.com>
2021-02-24 18:07:48 +01:00
Matthew Skinner
ec1a91c6d7
[ipcamera] Fix for Instar and HLS. (#9766)
Signed-off-by: Matthew Skinner <matt@pcmus.com>
2021-01-13 22:11:46 +01:00
Wouter Born
d6364aceb1
Update license headers to 2021 (#9620)
Signed-off-by: Wouter Born <github@maindrain.net>
2021-01-02 22:03:14 +01:00
Wouter Born
ecac667258
Apply Spotless, update skeleton project version, resolve itest runbundles (#9459)
Signed-off-by: Wouter Born <github@maindrain.net>
2020-12-22 10:37:44 +01:00
jenkins
e4554f4aa6 [unleash-maven-plugin] Preparation for next development cycle. 2020-12-21 10:36:42 +00:00
Matthew Skinner
84995bac83
[ipcamera] Improve ONVIF discovery and bug fixes. (#9199)
* Fix Offline detection and Improve discovery.
* Motion options bug fix.
* Message content bug fix.
* Fix all handlers to process all chunks as one.
* Remove password from FFmpeg command log.

Signed-off-by: Matthew Skinner <matt@pcmus.com>
2020-12-06 21:56:25 -08:00
sidamos
8c3a488a30
[ipcamera] Add channel Privacy Mode to Amcrest and Dahua handlers (#9092)
* Add channel Privacy Mode to Amcrest and Dahua handlers

Signed-off-by: Thomas <thomas@boerkel.de>
2020-11-26 09:53:52 -08:00
Kai Kreuzer
007c3b56e5
removed deprecated author information from binding.xml (#9113)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2020-11-23 19:06:33 -08:00
Matthew Skinner
8b3c633b8d
[ipcamera] Improve ONVIF preset naming (#8948)
* Refactor to prevent endless loop.
* Allow `-rtsp_transport tcp` to be over-ridden.
* Display actual preset names
* Allow IP to not match due to Hostname given in setup.
* Fix index off by 1
* Bug fixes for HLS
* Compatibility fix for GotoPreset
* Improve default snapshot quality and allow FFmpeg arguments to be
changed.

Signed-off-by: Matthew Skinner <matt@pcmus.com>

Co-authored-by: Connor Petty <mistercpp2000@gmail.com>
2020-11-20 22:27:49 -08:00
Matthew Skinner
459ee8d7cd
[ipcamera] Refactor labels and defaults for openHAB 3 (#8752)
Signed-off-by: Matthew Skinner <matt@pcmus.com>
2020-10-18 19:40:00 +02:00
Wouter Born
978e122e00
Rework ThingActions (#8755)
* Remove duplication by making use of default Java generated exceptions
* Make ThingActions labels/descriptions more consistent

Signed-off-by: Wouter Born <github@maindrain.net>
2020-10-15 10:53:53 +02:00
Matthew Skinner
e1cde78557
[ipcamera] GIF recording bug fix, compatibility fix for http headers (#8654)
+ Bug fix: Recording to GIF would only record for 5 seconds.

+ Clean up readme to remove channels and configs that don't exist after
moving to actions.

+ Compatibility fix for http headers.

Signed-off-by: Matthew Skinner <matt@pcmus.com>
2020-10-04 18:01:25 +02:00
Hilbrand Bouwkamp
003c3af985
Remove immediate = true from all Components (#8615)
We recommend not to use this on add-ons.

Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
2020-10-01 20:27:01 -07:00
Wouter Born
7f39d01a0f
Remove/ignore Eclipse project files (#8529)
Fixes #8451

Signed-off-by: Wouter Born <github@maindrain.net>
2020-09-21 22:50:37 +02:00
Kai Kreuzer
6df6783b60 added migrated 2.x add-ons
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2020-09-21 03:37:19 +02:00