Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ipcamera] Improve ONVIF discovery and bug fixes. #9199

Merged
merged 10 commits into from
Dec 7, 2020

Conversation

Skinah
Copy link
Contributor

@Skinah Skinah commented Dec 2, 2020

Closed #9167
Closed #9023
Closed #9022

This PR changes the following:

  • Fix Offline detection. Would not detect the camera was offline when not polling a snapshot.
  • Improve ONVIF discovery. Now scans on all NICs instead of only the first interface the binding would find.
  • Fix motion alarm FFmpeg options. Config was not working correctly if the user supplied options was '-vf xxxxxx' due to binding already providing this argument already.
  • Improve log by removing password from logged FFmpeg commands.
  • Refactor some code to make it slightly faster and consistent between similar classes.

Signed-off-by: Matthew Skinner <matt@pcmus.com>
Signed-off-by: Matthew Skinner <matt@pcmus.com>
Signed-off-by: Matthew Skinner <matt@pcmus.com>
Signed-off-by: Matthew Skinner <matt@pcmus.com>
Signed-off-by: Matthew Skinner <matt@pcmus.com>
Signed-off-by: Matthew Skinner <matt@pcmus.com>
Signed-off-by: Matthew Skinner <matt@pcmus.com>
Signed-off-by: Matthew Skinner <matt@pcmus.com>
Skinah and others added 2 commits December 5, 2020 12:47
…/binding/ipcamera/internal/Ffmpeg.java


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

Co-authored-by: Connor Petty <mistercpp2000@gmail.com>
Signed-off-by: Matthew Skinner <matt@pcmus.com>
openChannels.add(datagramChannel);
}
if (!openChannels.isEmpty()) {
openChannels.writeAndFlush(wsDiscovery());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this still return a future that you should wait for? Or do you not need to do that anymore?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don’t need to use a future as it gives no benefits and only increases code length.

@cpmeister cpmeister added the enhancement An enhancement or new feature for an existing add-on label Dec 7, 2020
@cpmeister cpmeister merged commit 84995ba into openhab:main Dec 7, 2020
@cpmeister cpmeister added this to the 3.0.0.M6 milestone Dec 7, 2020
chrisonline pushed a commit to chrisonline/openhab-addons that referenced this pull request Dec 7, 2020
* 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>
Signed-off-by: Christian Grasser <info@christiangrasser.at>
boehan pushed a commit to boehan/openhab-addons that referenced this pull request Apr 12, 2021
* 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>
marcfischerboschio pushed a commit to bosch-io/openhab-addons that referenced this pull request May 5, 2022
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement An enhancement or new feature for an existing add-on
Projects
None yet
2 participants