[ipcamera] Fix Hikvision digest stopping ipcamera.mjpeg (openhab#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> Signed-off-by: Nick Waterton <n.waterton@outlook.com>
NickWaterton · Dec 30, 2021 · e476c43 · e476c43
1 parent 60e6c87
commit e476c43
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/...ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraHandler.java b/...ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraHandler.java
@@ -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++) {