guzijian / wvp-GB28181-pro · Commits

Commit f00d6863cf6d91ff82f4f5f2baf41dbe555e211a

Authored by Lawrence
1 parent 3d2aeb89

扩展点播SDP协议范围，兼容海康等设备（issue #7）

Inline Side-by-side
Showing 1 changed file with 10 additions and 4 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
  View file @f00d686
@@ -302,16 +302,22 @@ public class SIPCommander implements ISIPCommander { @@ -302,16 +302,22 @@ public class SIPCommander implements ISIPCommander {
302 content.append("c=IN IP4 "+mediaInfo.getWanIp()+"\r\n"); 302 content.append("c=IN IP4 "+mediaInfo.getWanIp()+"\r\n");
303 content.append("t=0 0\r\n"); 303 content.append("t=0 0\r\n");
304 if("TCP-PASSIVE".equals(streamMode)) { 304 if("TCP-PASSIVE".equals(streamMode)) {
305 - content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 98 97\r\n"); 305 + content.append("m=video "+ mediaPort +" TCP/RTP/AVP 126 125 99 34 98 97 96\r\n");
306 }else if ("TCP-ACTIVE".equals(streamMode)) { 306 }else if ("TCP-ACTIVE".equals(streamMode)) {
307 - content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 98 97\r\n"); 307 + content.append("m=video "+ mediaPort +" TCP/RTP/AVP 126 125 99 34 98 97 96\r\n");
308 }else if("UDP".equals(streamMode)) { 308 }else if("UDP".equals(streamMode)) {
309 - content.append("m=video "+ mediaPort +" RTP/AVP 96 98 97\r\n"); 309 + content.append("m=video "+ mediaPort +" RTP/AVP 126 125 99 34 98 97 96\r\n");
310 } 310 }
311 content.append("a=recvonly\r\n"); 311 content.append("a=recvonly\r\n");
312 - content.append("a=rtpmap:96 PS/90000\r\n"); 312 + content.append("a=fmtp:126 profile-level-id=42e01e\r\n");
  313 + content.append("a=rtpmap:126 H264/90000\r\n");
  314 + content.append("a=rtpmap:125 H264S/90000\r\n");
  315 + content.append("a=fmtp:125 profile-level-id=42e01e\r\n");
  316 + content.append("a=rtpmap:99 MP4V-ES/90000\r\n");
  317 + content.append("a=fmtp:99 profile-level-id=3\r\n");
313 content.append("a=rtpmap:98 H264/90000\r\n"); 318 content.append("a=rtpmap:98 H264/90000\r\n");
314 content.append("a=rtpmap:97 MPEG4/90000\r\n"); 319 content.append("a=rtpmap:97 MPEG4/90000\r\n");
  320 + content.append("a=rtpmap:96 PS/90000\r\n");
315 if("TCP-PASSIVE".equals(streamMode)){ // tcp被动模式 321 if("TCP-PASSIVE".equals(streamMode)){ // tcp被动模式
316 content.append("a=setup:passive\r\n"); 322 content.append("a=setup:passive\r\n");
317 content.append("a=connection:new\r\n"); 323 content.append("a=connection:new\r\n");