guzijian / wvp-GB28181-pro · Commits

Commit ae4d33013136dfdceb129e96ae52bdf375d91dbe

Authored by Lawrence
1 parent 872d336d

修正播放回放ssrc

Inline Side-by-side
Showing 1 changed file with 4 additions and 11 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
  View file @ae4d330
... ... @@ -290,12 +290,8 @@ public class SIPCommander implements ISIPCommander {
290 290 @Override
291 291 public void playStreamCmd(Device device, String channelId, ZLMHttpHookSubscribe.Event event, SipSubscribe.Event errorEvent) {
292 292 try {
293   - String ssrc = "";
294   - if (rtpEnable) {
295   - ssrc = String.format("gb_play_%s_%s", device.getDeviceId(), channelId);
296   - }else {
297   - ssrc = streamSession.createPlaySsrc();
298   - }
  293 +
  294 + String ssrc = streamSession.createPlaySsrc();
299 295 String streamId = null;
300 296 if (rtpEnable) {
301 297 streamId = String.format("gb_play_%s_%s", device.getDeviceId(), channelId);
... ... @@ -412,16 +408,13 @@ public class SIPCommander implements ISIPCommander {
412 408 , SipSubscribe.Event errorEvent) {
413 409 try {
414 410 MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
415   - String ssrc = null;
  411 + String ssrc = streamSession.createPlayBackSsrc();
416 412 String streamId = null;
417 413 if (rtpEnable) {
418   - ssrc = String.format("gb_playback_%s_%s", device.getDeviceId(), channelId);
419   - streamId = ssrc;
  414 + streamId = String.format("gb_playback_%s_%s", device.getDeviceId(), channelId);
420 415 }else {
421   - ssrc = streamSession.createPlayBackSsrc();
422 416 streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
423 417 }
424   -
425 418 // 添加订阅
426 419 JSONObject subscribeKey = new JSONObject();
427 420 subscribeKey.put("app", "rtp");
... ...