demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-25 14:55:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix mjpeg does not work if overridden (#17544)

Browse Source 
Signed-off-by: Matthew Skinner <matt@pcmus.com>
This commit is contained in:
Matthew Skinner 2024-10-12 19:04:53 +11:00 committed by GitHub
parent 7666ee0aa3
commit c6b2e2da75
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/DahuaHandler.java
View File

@ -20,6 +20,7 @@ import java.util.regex.Pattern;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.binding.ipcamera.internal.handler.IpCameraHandler;
import org.openhab.binding.ipcamera.internal.onvif.OnvifConnection.RequestType;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.PercentType;
@ -156,6 +157,7 @@ public class DahuaHandler extends ChannelDuplexHandler {
ipCameraHandler.setChannelState(CHANNEL_TOO_DARK_ALARM, OnOffType.OFF);
}
break;
case "SceneChange":
case "VideoAbnormalDetection":
if ("Start".equals(action)) {
ipCameraHandler.setChannelState(CHANNEL_SCENE_CHANGE_ALARM, OnOffType.ON);
@ -191,10 +193,14 @@ public class DahuaHandler extends ChannelDuplexHandler {
case "LensMaskClose":
ipCameraHandler.setChannelState(CHANNEL_ENABLE_PRIVACY_MODE, OnOffType.OFF);
break;
// Skip these so they are not logged.
case "TimeChange":
// Check updated time matches openHAB's and store the offset which is needed for ONVIF
ipCameraHandler.onvifCamera.sendOnvifRequest(RequestType.GetSystemDateAndTime,
ipCameraHandler.onvifCamera.deviceXAddr);
break;
// Skip these so they are not logged.
case "NTPAdjustTime": // will trigger a TimeChange event no need to check twice
case "IntelliFrame":
case "NTPAdjustTime":
case "StorageChange":
case "Reboot":
case "NewFile":
@ -202,6 +208,7 @@ public class DahuaHandler extends ChannelDuplexHandler {
case "RtspSessionDisconnect":
case "LeFunctionStatusSync":
case "RecordDelete":
case "InterVideoAccess":
break;
default:
ipCameraHandler.logger.debug("Unrecognised Dahua event, Code={}, action={}", code, action);
@ -324,7 +331,7 @@ public class DahuaHandler extends ChannelDuplexHandler {
} else if (command instanceof PercentType percentCommand) {
ipCameraHandler.sendHttpGET("/cgi-bin/configManager.cgi?action=setConfig&Lighting_V2["
+ nvrChannelAdjusted + "][0][1].Mode=Manual&Lighting_V2[" + nvrChannelAdjusted
+ "][0][1].NearLight[0].Light=" + command.toString());
+ "][0][1].NearLight[0].Light=" + percentCommand.toString());
}
return;
case CHANNEL_AUTO_WHITE_LED:

2
bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/ReolinkHandler.java
View File

@ -452,7 +452,7 @@ public class ReolinkHandler extends ChannelDuplexHandler {
ipCameraHandler.sendHttpPOST("/api.cgi?cmd=SetIrLights" + ipCameraHandler.reolinkAuth,
"[{\"cmd\": \"SetIrLights\",\"action\": 0,\"param\": {\"IrLights\": {\"channel\": "
+ ipCameraHandler.cameraConfig.getNvrChannel() + ",\"state\": \"Off\"}}}]");
} else if (OnOffType.ON.equals(command) || command instanceof PercentType percentCommand) {
} else if (OnOffType.ON.equals(command) || command instanceof PercentType) {
ipCameraHandler.sendHttpPOST("/api.cgi?cmd=SetIrLights" + ipCameraHandler.reolinkAuth,
"[{\"cmd\": \"SetIrLights\",\"action\": 0,\"param\": {\"IrLights\": {\"channel\": "
+ ipCameraHandler.cameraConfig.getNvrChannel() + ",\"state\": \"On\"}}}]");

2
bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraHandler.java
View File

@ -241,7 +241,7 @@ public class IpCameraHandler extends BaseThingHandler {
}
if (contentType.contains("multipart")) {
boundary = Helper.searchString(contentType, "boundary=");
if (mjpegUri.equals(requestUrl)) {
if (mjpegUri.endsWith(requestUrl)) {
if (msg instanceof HttpMessage) {
// very start of stream only
mjpegContentType = contentType;

2
bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifConnection.java
View File

@ -124,7 +124,7 @@ public class OnvifConnection {
private String user = "";
private String password = "";
private int onvifPort = 80;
private String deviceXAddr = "http://" + ipAddress + "/onvif/device_service";
public String deviceXAddr = "http://" + ipAddress + "/onvif/device_service";
private String eventXAddr = "http://" + ipAddress + "/onvif/device_service";
private String mediaXAddr = "http://" + ipAddress + "/onvif/device_service";
@SuppressWarnings("unused")