Commit Graph

65 Commits

Author SHA1 Message Date
Matthew Skinner
8701b86a37
[ipcamera] FIX: TAPO branded cameras require xAddr port to be different (#15073)
* FIX TAPO branded cameras require xAddr port to be different from the
main ONVIF PORT
* Fix for old API instar cameras.

---------

Signed-off-by: Matthew Skinner <matt@pcmus.com>
2023-07-16 13:32:40 +02:00
Matthew Skinner
1f78f9ac7b
[ipcamera] Fix discovery crashes when networks have access rights issues in docker (#15059)
* Fix discovery crashes if network use is blocked by docker.
* Change log levels to be more useful.
* add better reolink discovery check

Signed-off-by: Matthew Skinner <matt@pcmus.com>
2023-07-02 09:11:06 +02:00
Matthew Skinner
01add04f9e
[ipcamera] Add Reolink API support (#14728)
Signed-off-by: Matthew Skinner <matt@pcmus.com>
2023-05-13 12:31:39 +02:00
tb4jc
a2dcf2fcef
[ipcamera] Fix orphan ffmpeg process after stopping stream URL (#14909)
* Setting ffmpeg reference 'ffmpegMjpeg' to null after stopping convertion to fix automatic restart of ffmpeg process.

---------

Signed-off-by: Thomas Burri <th@thonojato.ch>
2023-05-08 11:43:49 +02:00
mlobstein
6e2dddfe73
Declare connection for bindings G thru M (#14902)
* Declare connection for bindings G-M

Signed-off-by: Michael Lobstein <michael.lobstein@gmail.com>
2023-04-29 20:24:54 +02:00
Robert Eckhoff
4d5be1f64c
[ipcamera] Fix servlet exceptions due to non unique names (#14872)
* [ipcamera] Fix servlet exceptions due to non unique names

[IP camera] on OH4 has the same servlet issue that was fixed by PR #14554.  This PR uses that PR as a template to fix the issue in the IPcamera binding.  (That issue being that only one camera was able to stream.) This was tested locally on OH4M2 and it works.

Signed-off-by: Bob Eckhoff  <katmandodo@yahoo.com>
2023-04-23 21:23:42 +02:00
Wouter Born
50cdd02447
[ipcamera] Make sure created Servlet supports async (#14552)
Fixes the folowing errors:

```
HTTP ERROR 500 java.lang.IllegalStateException: !asyncSupported: NotAsync:org.ops4j.pax.web.service.spi.servlet.OsgiInitializedServlet@536b0858
URI:	/ipcamera/192168493/ipcamera.jpg
STATUS:	500
MESSAGE:	java.lang.IllegalStateException: !asyncSupported: NotAsync:org.ops4j.pax.web.service.spi.servlet.OsgiInitializedServlet@536b0858
SERVLET:	org.openhab.binding.ipcamera.internal.servlet.CameraServlet
CAUSED BY:	java.lang.IllegalStateException: !asyncSupported: NotAsync:org.ops4j.pax.web.service.spi.servlet.OsgiInitializedServlet@536b0858
Powered by Jetty:// 9.4.50.v20221201
```

See:

* https://community.openhab.org/t/openhab-4-0-snapshot-discussion/142322/226
* https://groups.google.com/g/ops4j/c/E9p7tPydPmo
* https://github.com/ops4j/org.ops4j.pax.web/issues/1767

Signed-off-by: Wouter Born <github@maindrain.net>
2023-03-08 17:20:08 +01:00
J-N-K
89d0689e36
fix i18n for bindings (#14235)
Also-By: Jacob Laursen <jacob-github@vindvejr.dk>
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-01-21 12:14:51 +01:00
J-N-K
5f8214f08a
Adapt to core changes (addon.xml) (#13289)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-01-15 20:31:42 +01:00
Jacob Laursen
4dd6d3a8a2
Update license headers to 2023 (#14154)
* Update copyright year in configuration
* Update license headers

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
2023-01-06 09:49:54 +01:00
J-N-K
4d6d6443ef
fix spotless after release (#14014)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2022-12-19 15:22:17 +01:00
openhab-bot
7993786dc9 [unleash-maven-plugin] Preparation for next development cycle. 2022-12-19 00:55:11 +00:00
Дилян Палаузов
ef836a15dc
typos: success, successful (#13997) 2022-12-18 14:18:24 +01:00
Matthew Skinner
2a7b6bf1c9
[ipcamera] Add a check to see if FFmpeg is frozen for mjpeg creation (#13896)
* check if ffmpegMjpeg is frozen

Signed-off-by: Matthew Skinner <matt@pcmus.com>
2022-12-10 13:54:22 +01:00
Jerome Luckenbach
0e68936663
[Documentation] Markdown improvements f to m (#13866)
Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
2022-12-08 21:36:05 +01:00
Дилян Палаузов
2a5d6beb64
Typos a/an (#13846) 2022-12-05 18:47:43 +01:00
Matthew Skinner
2a78b306d8
[ipcamera] Instar API updates for new 2k+ range (#13805)
* Instar updates
* Detect which API to use from reply.
* Add handling of REFRESH to instar.

Signed-off-by: Matthew Skinner <matt@pcmus.com>
2022-12-03 10:20:11 +01:00
Matthew Skinner
ea134d8215
[ipcamera] Improve support for newer 2k+ Instar cameras (#13773)
* Fix never ending WARN when HIK camera does not support alarm inputs.
* Streamline code.
* Update Instar support for 2k+ Generation.
* Fix alarm codes.
* Add CHANNEL_LAST_EVENT_DATA

Signed-off-by: Matthew Skinner <matt@pcmus.com>
2022-11-26 08:15:29 +01:00
Matthew Skinner
234d354a2e
[ipcamera] Fix multiple WARNs when HIK camera does not support alarm inputs (#13606)
* Fix never ending WARN when HIK camera does not support alarm inputs.
* Streamline code.

Signed-off-by: Matthew Skinner <matt@pcmus.com>
2022-10-27 08:28:27 +02:00
Matthew Skinner
3aac15df62
Fix mjpeg wont open multiple streams when port is not 80 (#13502)
Signed-off-by: Matthew Skinner <matt@pcmus.com>
2022-10-08 21:26:51 +02:00
Matthew Skinner
cc50497f31
[ipcamera] FFmpeg based alarms will now auto restart if stopped (#13446)
* FFmpeg alarms now auto restart

Signed-off-by: Matthew Skinner <matt@pcmus.com>
2022-10-01 14:19:25 +02:00
Matthew Skinner
6805f8461e
[ipcamera] Fix ONVIF fails to reconnect (#13396)
* Fix reconnecting issues
* Cleanup logging.

Signed-off-by: Matthew Skinner <matt@pcmus.com>
2022-09-17 10:51:55 +02:00
tb4jc
f203b3f202
[ipcamera] Added URL encoding fix for passwords that contains special characters. (#13035)
* Added URL encoding fix for passwords that contains special characters.
* Simplified as proposed.

Signed-off-by: Thomas Burri <th@thonjato.ch>
2022-06-30 08:27:40 +02:00
Kai Kreuzer
440f603e88
Apply spotless and resolver (#13027)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2022-06-27 16:00:37 +02:00
openhab-bot
ed4858ebbb [unleash-maven-plugin] Preparation for next development cycle. 2022-06-26 18:18:40 +00:00
jimtng
075170e4b9
[ipcamera] Fix multiple parts handling for Dahua events (#12964)
* [ipcamera] Fix multiple part handling for Dahua events
* [ipcamera] Call processSettings only when data contains no boundary

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
2022-06-23 19:06:34 +02:00
Matthew Skinner
867628a701
Doorbird online/offline bug fix (#12814)
Signed-off-by: Matthew Skinner <matt@pcmus.com>
2022-05-26 15:35:59 +02:00
Matthew Skinner
7da00f1d68
Digest fix for doorbird. (#12399)
Signed-off-by: Matthew Skinner <matt@pcmus.com>
2022-03-02 13:21:40 +01:00
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