Merge remote-tracking branch 'origin/结构优化' into 结构优化
commit
7df31fa5eb
|
@ -492,6 +492,7 @@ public class SIPCommander implements ISIPCommander {
|
||||||
streamSession.removeByCallId(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getCallId());
|
streamSession.removeByCallId(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getCallId());
|
||||||
Request byteRequest = headerProvider.createByteRequest(device, channelId, ssrcTransaction.getSipTransactionInfo());
|
Request byteRequest = headerProvider.createByteRequest(device, channelId, ssrcTransaction.getSipTransactionInfo());
|
||||||
sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), byteRequest, null, okEvent);
|
sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), byteRequest, null, okEvent);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -126,6 +126,9 @@ public class ByeRequestProcessor extends SIPRequestProcessorParent implements In
|
||||||
if (resourceService != null) {
|
if (resourceService != null) {
|
||||||
resourceService.stopPlay(channel, null);
|
resourceService.stopPlay(channel, null);
|
||||||
}
|
}
|
||||||
|
if (userSetting.getUseCustomSsrcForParentInvite()) {
|
||||||
|
mediaServerService.releaseSsrc(mediaInfo.getId(), sendRtpItem.getSsrc());
|
||||||
|
}
|
||||||
if (sendRtpItem.getPlayType().equals(InviteStreamType.PUSH)) {
|
if (sendRtpItem.getPlayType().equals(InviteStreamType.PUSH)) {
|
||||||
ParentPlatform platform = platformService.queryPlatformByServerGBId(sendRtpItem.getDestId());
|
ParentPlatform platform = platformService.queryPlatformByServerGBId(sendRtpItem.getDestId());
|
||||||
if (platform != null) {
|
if (platform != null) {
|
||||||
|
|
Loading…
Reference in New Issue