From 713aa00acc398e44cb2a59e4f5c3f55b4e0784d8 Mon Sep 17 00:00:00 2001
From: xiaoQQya <xiaoQQya@126.com>
Date: 星期三, 22 三月 2023 15:21:22 +0800
Subject: [PATCH] perf(snap): 优化点播成功后截图使用 rtsp 流, 新增对 H265 编码视频截图的支持
---
src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java | 77 ++++++++++++++++++++++++++++++++++++--
1 files changed, 73 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
index bf2a0ee..afe1183 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
@@ -1,9 +1,13 @@
package com.genersoft.iot.vmp.gb28181.utils;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
+import com.genersoft.iot.vmp.gb28181.bean.RemoteAddressInfo;
import com.genersoft.iot.vmp.utils.GitUtil;
import gov.nist.javax.sip.address.AddressImpl;
import gov.nist.javax.sip.address.SipUri;
import gov.nist.javax.sip.header.Subject;
+import gov.nist.javax.sip.message.SIPRequest;
+import org.springframework.util.ObjectUtils;
import javax.sip.PeerUnavailableException;
import javax.sip.SipFactory;
@@ -52,10 +56,15 @@
public static UserAgentHeader createUserAgentHeader(SipFactory sipFactory, GitUtil gitUtil) throws PeerUnavailableException, ParseException {
List<String> agentParam = new ArrayList<>();
- agentParam.add("WVP-Pro v");
- if (gitUtil != null && gitUtil.getCommitTime() != null) {
- agentParam.add(gitUtil.getBuildVersion() + ".");
- agentParam.add(gitUtil.getCommitTime());
+ agentParam.add("WVP-Pro ");
+ if (gitUtil != null ) {
+ if (!ObjectUtils.isEmpty(gitUtil.getBuildVersion())) {
+ agentParam.add("v");
+ agentParam.add(gitUtil.getBuildVersion() + ".");
+ }
+ if (!ObjectUtils.isEmpty(gitUtil.getCommitTime())) {
+ agentParam.add(gitUtil.getCommitTime());
+ }
}
return sipFactory.createHeaderFactory().createUserAgentHeader(agentParam);
}
@@ -113,4 +122,64 @@
return builder.toString();
}
+ /**
+ * 浠庤姹備腑鑾峰彇璁惧ip鍦板潃鍜岀鍙ｅ彿
+ * @param request 璇锋眰
+ * @param sipUseSourceIpAsRemoteAddress false 浠巚ia涓幏鍙栧湴鍧�锛� true 鐩存帴鑾峰彇杩滅▼鍦板潃
+ * @return 鍦板潃淇℃伅
+ */
+ public static RemoteAddressInfo getRemoteAddressFromRequest(SIPRequest request, boolean sipUseSourceIpAsRemoteAddress) {
+
+ String remoteAddress;
+ int remotePort;
+ if (sipUseSourceIpAsRemoteAddress) {
+ remoteAddress = request.getRemoteAddress().getHostAddress();
+ remotePort = request.getRemotePort();
+ }else {
+ // 鍒ゆ柇RPort鏄惁鏀瑰彉锛屾敼鍙樺垯璇存槑璺敱nat淇℃伅鍙樺寲锛屼慨鏀硅澶囦俊鎭�
+ // 鑾峰彇鍒伴�氫俊鍦板潃绛変俊鎭�
+ remoteAddress = request.getTopmostViaHeader().getReceived();
+ remotePort = request.getTopmostViaHeader().getRPort();
+ // 瑙ｆ瀽鏈湴鍦板潃鏇夸唬
+ if (ObjectUtils.isEmpty(remoteAddress) || remotePort == -1) {
+ remoteAddress = request.getTopmostViaHeader().getHost();
+ remotePort = request.getTopmostViaHeader().getPort();
+ }
+ }
+
+ return new RemoteAddressInfo(remoteAddress, remotePort);
+ }
+
+ public static DeviceChannel updateGps(DeviceChannel deviceChannel, String geoCoordSys) {
+ if (deviceChannel.getLongitude()*deviceChannel.getLatitude() > 0) {
+
+ if (geoCoordSys == null) {
+ geoCoordSys = "WGS84";
+ }
+ if ("WGS84".equals(geoCoordSys)) {
+ deviceChannel.setLongitudeWgs84(deviceChannel.getLongitude());
+ deviceChannel.setLatitudeWgs84(deviceChannel.getLatitude());
+ Double[] position = Coordtransform.WGS84ToGCJ02(deviceChannel.getLongitude(), deviceChannel.getLatitude());
+ deviceChannel.setLongitudeGcj02(position[0]);
+ deviceChannel.setLatitudeGcj02(position[1]);
+ }else if ("GCJ02".equals(geoCoordSys)) {
+ deviceChannel.setLongitudeGcj02(deviceChannel.getLongitude());
+ deviceChannel.setLatitudeGcj02(deviceChannel.getLatitude());
+ Double[] position = Coordtransform.GCJ02ToWGS84(deviceChannel.getLongitude(), deviceChannel.getLatitude());
+ deviceChannel.setLongitudeWgs84(position[0]);
+ deviceChannel.setLatitudeWgs84(position[1]);
+ }else {
+ deviceChannel.setLongitudeGcj02(0.00);
+ deviceChannel.setLatitudeGcj02(0.00);
+ deviceChannel.setLongitudeWgs84(0.00);
+ deviceChannel.setLatitudeWgs84(0.00);
+ }
+ }else {
+ deviceChannel.setLongitudeGcj02(deviceChannel.getLongitude());
+ deviceChannel.setLatitudeGcj02(deviceChannel.getLatitude());
+ deviceChannel.setLongitudeWgs84(deviceChannel.getLongitude());
+ deviceChannel.setLatitudeWgs84(deviceChannel.getLatitude());
+ }
+ return deviceChannel;
+ }
}
--
Gitblit v1.8.0