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.

Sign up for GitHub

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

Jump to bottom

[ipcamera] Fix Hikvision digest stopping ipcamera.mjpeg #11457

Merged
merged 18 commits into from
Oct 30, 2021
Merged

[ipcamera] Fix Hikvision digest stopping ipcamera.mjpeg #11457

Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5e60731
Stop hik logging 401 with digest.
Skinah Oct 14, 2021
16a6e1e
Improve and fix generic cams
Skinah Oct 14, 2021
62b8289
Stop dahua IntelliFrame logging
Skinah Oct 15, 2021
7bd9b88
Catch IllegalStateException
Skinah Oct 15, 2021
8ef6634
Trial reusing channels.
Skinah Oct 17, 2021
58bb19b
Tidy up
Skinah Oct 17, 2021
e98ddfb
cleanup 2
Skinah Oct 17, 2021
cc17329
Cleanup 3
Skinah Oct 17, 2021
aad1866
Disable checking connection with event stream.
Skinah Oct 19, 2021
23c9b17
Bug fix
Skinah Oct 19, 2021
ff7a591
more cleanup
Skinah Oct 20, 2021
13f713d
more cleanup
Skinah Oct 20, 2021
cf97119
Reduce logging to only whats needed.
Skinah Oct 21, 2021
620aed7
fix offline detection.
Skinah Oct 21, 2021
49a8ec3
fixes to ipcamera.mjpeg
Skinah Oct 23, 2021
8cebd70
reverse some connection checks
Skinah Oct 24, 2021
7800f8e
Fix Hikvision Digest stops ipcamera.mjpeg
Skinah Oct 27, 2021
fa0a0e2
Merge branch 'openhab:main' into camera
Skinah Oct 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions ...ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,20 +252,22 @@ public void channelRead(@Nullable ChannelHandlerContext ctx, @Nullable Object ms
incomingJpeg = new byte[bytesToRecieve];
}
}
} else {
// 401 errors already handled in pipeline by MyNettyAuthHandler.java
return;
}
}
if (msg instanceof HttpContent) {
if (mjpegUri.equals(requestUrl)) {
HttpContent content = (HttpContent) msg;
if (mjpegUri.equals(requestUrl) && !(content instanceof LastHttpContent)) {
// multiple MJPEG stream packets come back as this.
HttpContent content = (HttpContent) msg;
byte[] chunkedFrame = new byte[content.content().readableBytes()];
content.content().getBytes(content.content().readerIndex(), chunkedFrame);
CameraServlet localServlet = servlet;
if (localServlet != null) {
localServlet.openStreams.queueFrame(chunkedFrame);
}
} else {
HttpContent content = (HttpContent) msg;
// Found some cameras use Content-Type: image/jpg instead of image/jpeg
if (contentType.contains("image/jp")) {
for (int i = 0; i < content.content().capacity(); i++) {
Expand Down