修复国标级联点播
parent
1b34787d3a
commit
09c668f017
|
@ -669,11 +669,9 @@ public class PlayServiceImpl implements IPlayService {
|
||||||
if (streamInfo != null) {
|
if (streamInfo != null) {
|
||||||
streamInfo.setStartTime(startTime);
|
streamInfo.setStartTime(startTime);
|
||||||
streamInfo.setEndTime(endTime);
|
streamInfo.setEndTime(endTime);
|
||||||
deviceChannelService.startPlay(channel.getId(), streamInfo.getStream());
|
|
||||||
InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(InviteSessionType.PLAYBACK, mediaInfo.getStream());
|
InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(InviteSessionType.PLAYBACK, mediaInfo.getStream());
|
||||||
if (inviteInfo != null) {
|
if (inviteInfo != null) {
|
||||||
inviteInfo.setStatus(InviteSessionStatus.ok);
|
inviteInfo.setStatus(InviteSessionStatus.ok);
|
||||||
|
|
||||||
inviteInfo.setStreamInfo(streamInfo);
|
inviteInfo.setStreamInfo(streamInfo);
|
||||||
inviteStreamService.updateInviteInfo(inviteInfo);
|
inviteStreamService.updateInviteInfo(inviteInfo);
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,8 +52,14 @@ public class SendRtpServerServiceImpl implements ISendRtpServerService {
|
||||||
if (localPort <= 0) {
|
if (localPort <= 0) {
|
||||||
throw new PlayException(javax.sip.message.Response.SERVER_INTERNAL_ERROR, "server internal error");
|
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());
|
tcp, rtcp, userSetting.getServerId());
|
||||||
|
if (sendRtpInfo == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
sendRtpInfo.setApp(app);
|
||||||
|
sendRtpInfo.setStream(stream);
|
||||||
|
return sendRtpInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue