浏览代码

修复国标级联点播

648540858 1 年之前
父节点
当前提交
09c668f017

+ 0 - 2
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java

@@ -669,11 +669,9 @@ public class PlayServiceImpl implements IPlayService {
         if (streamInfo != null) {
             streamInfo.setStartTime(startTime);
             streamInfo.setEndTime(endTime);
-            deviceChannelService.startPlay(channel.getId(), streamInfo.getStream());
             InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(InviteSessionType.PLAYBACK, mediaInfo.getStream());
             if (inviteInfo != null) {
                 inviteInfo.setStatus(InviteSessionStatus.ok);
-
                 inviteInfo.setStreamInfo(streamInfo);
                 inviteStreamService.updateInviteInfo(inviteInfo);
             }

+ 7 - 1
src/main/java/com/genersoft/iot/vmp/service/impl/SendRtpServerServiceImpl.java

@@ -52,8 +52,14 @@ public class SendRtpServerServiceImpl implements ISendRtpServerService {
         if (localPort <= 0) {
             throw new PlayException(javax.sip.message.Response.SERVER_INTERNAL_ERROR, "server internal error");
         }
-        return SendRtpInfo.getInstance(localPort, mediaServer, ip, port, ssrc, null, platformId, channelId,
+        SendRtpInfo sendRtpInfo = SendRtpInfo.getInstance(localPort, mediaServer, ip, port, ssrc, null, platformId, channelId,
                 tcp, rtcp, userSetting.getServerId());
+        if (sendRtpInfo == null) {
+            return null;
+        }
+        sendRtpInfo.setApp(app);
+        sendRtpInfo.setStream(stream);
+        return sendRtpInfo;
     }
 
     @Override