Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #869 from shanyuanzz/wvp-28181-2.0 

优化低倍速下云台控制的zoom缩放速率变化问题。
pull/872/head
648540858 2023-05-29 09:14:56 +08:00 committed by GitHub
parent e42d015729 5ebd788cef
commit 5632718d6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
View File

@ -146,6 +146,11 @@ public class SIPCommander implements ISIPCommander {
builder.append(strTmp, 0, 2); builder.append(strTmp, 0, 2);
strTmp = String.format("%02X", parameter2); strTmp = String.format("%02X", parameter2);
builder.append(strTmp, 0, 2); builder.append(strTmp, 0, 2);
//优化zoom变倍速率
if ((combineCode2 > 0) && (combineCode2 <16))
{
combineCode2 = 16;
}
strTmp = String.format("%X", combineCode2); strTmp = String.format("%X", combineCode2);
builder.append(strTmp, 0, 1).append("0"); builder.append(strTmp, 0, 1).append("0");
//计算校验码 //计算校验码

6
src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
View File

@ -113,6 +113,12 @@ public class SipUtils {
strTmp = String.format("%02X", moveSpeed); strTmp = String.format("%02X", moveSpeed);
builder.append(strTmp, 0, 2); builder.append(strTmp, 0, 2);
builder.append(strTmp, 0, 2); builder.append(strTmp, 0, 2);
//优化zoom低倍速下的变倍速率
if ((zoomSpeed > 0) && (zoomSpeed <16))
{
zoomSpeed = 16;
}
strTmp = String.format("%X", zoomSpeed); strTmp = String.format("%X", zoomSpeed);
builder.append(strTmp, 0, 1).append("0"); builder.append(strTmp, 0, 1).append("0");
//计算校验码 //计算校验码