Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

panlinlin

2021-01-15 cf8a22f50b81fa30abaa518bdce660cd65deabea

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

@@ -409,12 +409,7 @@
      try {

         MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();

         String ssrc = streamSession.createPlayBackSsrc();

         String streamId = null;

         if (rtpEnable) {

            streamId = String.format("gb_playback_%s_%s", device.getDeviceId(), channelId);

         }else {

            streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();

         }

         String streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();

         // 添加订阅

         JSONObject subscribeKey = new JSONObject();

         subscribeKey.put("app", "rtp");