guzijian / wvp-GB28181-pro · Commits

Commit 5632718d6f6819e389072394458b211748358a31

Authored by 648540858
Committed by GitHub
2 parents e42d0157 5ebd788c

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

优化低倍速下云台控制的zoom缩放速率变化问题。
Inline Side-by-side
Showing 2 changed files with 11 additions and 0 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
  View file @5632718
@@ -146,6 +146,11 @@ public class SIPCommander implements ISIPCommander { @@ -146,6 +146,11 @@ public class SIPCommander implements ISIPCommander {
146 builder.append(strTmp, 0, 2); 146 builder.append(strTmp, 0, 2);
147 strTmp = String.format("%02X", parameter2); 147 strTmp = String.format("%02X", parameter2);
148 builder.append(strTmp, 0, 2); 148 builder.append(strTmp, 0, 2);
  149 + //优化zoom变倍速率
  150 + if ((combineCode2 > 0) && (combineCode2 <16))
  151 + {
  152 + combineCode2 = 16;
  153 + }
149 strTmp = String.format("%X", combineCode2); 154 strTmp = String.format("%X", combineCode2);
150 builder.append(strTmp, 0, 1).append("0"); 155 builder.append(strTmp, 0, 1).append("0");
151 //计算校验码 156 //计算校验码
src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
  View file @5632718
@@ -113,6 +113,12 @@ public class SipUtils { @@ -113,6 +113,12 @@ public class SipUtils {
113 strTmp = String.format("%02X", moveSpeed); 113 strTmp = String.format("%02X", moveSpeed);
114 builder.append(strTmp, 0, 2); 114 builder.append(strTmp, 0, 2);
115 builder.append(strTmp, 0, 2); 115 builder.append(strTmp, 0, 2);
  116 +
  117 + //优化zoom低倍速下的变倍速率
  118 + if ((zoomSpeed > 0) && (zoomSpeed <16))
  119 + {
  120 + zoomSpeed = 16;
  121 + }
116 strTmp = String.format("%X", zoomSpeed); 122 strTmp = String.format("%X", zoomSpeed);
117 builder.append(strTmp, 0, 1).append("0"); 123 builder.append(strTmp, 0, 1).append("0");
118 //计算校验码 124 //计算校验码