Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0

Lawrence

2021-01-10 625842fd0d53909066b37febcbe5d12ae53635ed

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

@@ -77,6 +77,9 @@
   @Value("${media.seniorSdp}")

   private boolean seniorSdp;



   @Value("${media.autoApplyPlay}")

   private boolean autoApplyPlay;



   @Autowired

   private ZLMHttpHookSubscribe subscribe;



@@ -287,8 +290,12 @@
   @Override

   public void playStreamCmd(Device device, String channelId, ZLMHttpHookSubscribe.Event event, SipSubscribe.Event errorEvent) {

      try {



         String ssrc = streamSession.createPlaySsrc();

         String ssrc = "";

         if (rtpEnable) {

            ssrc = String.format("gb_play_%s_%s", device.getDeviceId(), channelId);

         }else {

            ssrc = streamSession.createPlaySsrc();

         }

         String streamId = null;

         if (rtpEnable) {

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

@@ -408,7 +415,12 @@
         , SipSubscribe.Event errorEvent) {

      try {

         MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();

         String ssrc = streamSession.createPlayBackSsrc();

         String ssrc = null;

         if (rtpEnable) {

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

         }else {

            ssrc = streamSession.createPlayBackSsrc();

         }

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

         // 添加订阅

         JSONObject subscribeKey = new JSONObject();