Merge branch 'talk' into main-dev

648540858

2023-03-20 039fbf7e243d4bf0f46b44e7dae2a5d36e978056

 src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java

@@ -4,6 +4,7 @@
import com.genersoft.iot.vmp.conf.UserSetting;

import com.genersoft.iot.vmp.gb28181.bean.SipTransactionInfo;

import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;

import com.genersoft.iot.vmp.utils.JsonUtil;

import com.genersoft.iot.vmp.utils.redis.RedisUtil;

import gov.nist.javax.sip.message.SIPResponse;

import org.springframework.beans.factory.annotation.Autowired;

@@ -28,7 +29,8 @@
      play,

      playback,

      download,

      broadcast

      broadcast,

      talk

   }



   /**

@@ -134,7 +136,7 @@
      List<SsrcTransaction> result= new ArrayList<>();

      for (int i = 0; i < ssrcTransactionKeys.size(); i++) {

         String key = (String)ssrcTransactionKeys.get(i);

         SsrcTransaction ssrcTransaction = (SsrcTransaction)RedisUtil.get(key);

         SsrcTransaction ssrcTransaction = JsonUtil.redisJsonToObject(key, SsrcTransaction.class);

         result.add(ssrcTransaction);

      }

      return result;