存储所有流信息到redis

648540858

2021-12-02 2bac0b3c222734aeb9087fee443af198bd67f06c

 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java

@@ -11,6 +11,7 @@
import com.genersoft.iot.vmp.gb28181.bean.Device;

import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;

import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;

import com.genersoft.iot.vmp.media.zlm.dto.OriginType;

import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;

import com.genersoft.iot.vmp.service.IMediaServerService;

import com.genersoft.iot.vmp.service.IMediaService;

@@ -164,12 +165,20 @@
            subscribe.response(mediaInfo, json);

         }

      }

       String app = json.getString("app");

       String stream = json.getString("stream");

      StreamInfo streamInfo = redisCatchStorage.queryPlaybackByStreamId(stream);

      JSONObject ret = new JSONObject();

      // 录像回放时不进行录像下载

      if (streamInfo != null) {

         ret.put("enableMP4", false);

      }else {

         ret.put("enableMP4", userSetup.isRecordPushLive());

      }

      ret.put("code", 0);

      ret.put("msg", "success");

      ret.put("enableHls", true);

      ret.put("enableMP4", userSetup.isRecordPushLive());

      ret.put("enableRtxp", true);

      return new ResponseEntity<String>(ret.toString(), HttpStatus.OK);

   }

   

@@ -307,24 +316,23 @@
         }else {

            if (!"rtp".equals(app)){



               boolean pushChange = false;



               MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);

               if (regist) {

                  if ((item.getOriginType() == 1 || item.getOriginType() == 2 || item.getOriginType() == 8)) {

                     pushChange = true;

                  StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(mediaServerItem, app, streamId, tracks);

                  redisCatchStorage.addStream(mediaServerItem, OriginType.values()[item.getOriginType()].getType(), app, streamId, streamInfo);

                  if (item.getOriginType() == OriginType.RTSP_PUSH.ordinal()

                        || item.getOriginType() == OriginType.RTMP_PUSH.ordinal()

                        || item.getOriginType() == OriginType.RTC_PUSH.ordinal() ) {

                     zlmMediaListManager.addMedia(item);

                     StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(mediaServerItem, app, streamId, tracks);

                     redisCatchStorage.addPushStream(mediaServerItem, app, streamId, streamInfo);

                  }

               }else {

                  int result = zlmMediaListManager.removeMedia( app, streamId);

                  redisCatchStorage.removePushStream(mediaServerItem, app, streamId);

                  if (result > 0) {

                     pushChange = true;

                  }

                  zlmMediaListManager.removeMedia( app, streamId);

                  redisCatchStorage.removeStream(mediaServerItem, OriginType.values()[item.getOriginType()].getType(), app, streamId);



               }

               if(pushChange) {

               if (item.getOriginType() == OriginType.RTSP_PUSH.ordinal()

                     || item.getOriginType() == OriginType.RTMP_PUSH.ordinal()

                     || item.getOriginType() == OriginType.RTC_PUSH.ordinal() ) {

                  // 发送流变化redis消息

                  JSONObject jsonObject = new JSONObject();

                  jsonObject.put("serverId", userSetup.getServerId());

@@ -358,14 +366,13 @@
      String mediaServerId = json.getString("mediaServerId");

      String streamId = json.getString("stream");

      String app = json.getString("app");



      // TODO 如果在给上级推流，也不停止。

      JSONObject ret = new JSONObject();

      ret.put("code", 0);

      if ("rtp".equals(app)){

         JSONObject ret = new JSONObject();

         ret.put("code", 0);

         ret.put("close", true);

         StreamInfo streamInfoForPlayCatch = redisCatchStorage.queryPlayByStreamId(streamId);

         if (streamInfoForPlayCatch != null) {

            // 如果在给上级推流，也不停止。

            if (redisCatchStorage.isChannelSendingRTP(streamInfoForPlayCatch.getChannelId())) {

               ret.put("close", false);

            } else {

@@ -378,6 +385,12 @@
            if (streamInfoForPlayBackCatch != null) {

               cmder.streamByeCmd(streamInfoForPlayBackCatch.getDeviceID(), streamInfoForPlayBackCatch.getChannelId());

               redisCatchStorage.stopPlayback(streamInfoForPlayBackCatch);

            }else {

               StreamInfo streamInfoForDownload = redisCatchStorage.queryDownloadByStreamId(streamId);

               // 进行录像下载时无人观看不断流

               if (streamInfoForDownload != null) {

                  ret.put("close", false);

               }

            }

         }

         MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);

@@ -386,8 +399,6 @@
         }

         return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);

      }else {

         JSONObject ret = new JSONObject();

         ret.put("code", 0);

         StreamProxyItem streamProxyItem = streamProxyService.getStreamProxyByAppAndStream(app, streamId);

         if (streamProxyItem != null && streamProxyItem.isEnable_remove_none_reader()) {

            ret.put("close", true);