修复合并分支造成的bug
parent
ee746e53cd
commit
3dc1e0368e
|
@ -364,8 +364,6 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
|
||||||
}
|
}
|
||||||
|
|
||||||
// 写入redis, 超时时回复
|
// 写入redis, 超时时回复
|
||||||
redisCatchStorage.updateSendRTPSever(sendRtpItem);
|
|
||||||
|
|
||||||
sendRtpItem.setStatus(1);
|
sendRtpItem.setStatus(1);
|
||||||
redisCatchStorage.updateSendRTPSever(sendRtpItem);
|
redisCatchStorage.updateSendRTPSever(sendRtpItem);
|
||||||
StringBuffer content = new StringBuffer(200);
|
StringBuffer content = new StringBuffer(200);
|
||||||
|
|
|
@ -117,7 +117,7 @@ public class PlayServiceImpl implements IPlayService {
|
||||||
// 点播超时回复BYE
|
// 点播超时回复BYE
|
||||||
cmder.streamByeCmd(device.getDeviceId(), channelId, streamInfo.getStream());
|
cmder.streamByeCmd(device.getDeviceId(), channelId, streamInfo.getStream());
|
||||||
// 释放rtpserver
|
// 释放rtpserver
|
||||||
mediaServerService.closeRTPServer(playResult.getDevice(), channelId, streamInfo.getStream());
|
mediaServerService.closeRTPServer(playResult.getDevice().getDeviceId(), channelId, streamInfo.getStream());
|
||||||
// 回复之前所有的点播请求
|
// 回复之前所有的点播请求
|
||||||
resultHolder.invokeAllResult(msg);
|
resultHolder.invokeAllResult(msg);
|
||||||
// TODO 释放ssrc
|
// TODO 释放ssrc
|
||||||
|
|
Loading…
Reference in New Issue