|
@@ -242,7 +242,7 @@ public class PlayServiceImpl implements IPlayService {
|
|
|
}, (code, msgStr) -> {
|
|
|
// invite点播超时
|
|
|
logger.warn("sip 点播超时");
|
|
|
- wvpResult.setCode(ErrorCode.ERROR100.getCode());
|
|
|
+ wvpResult.setCode(ErrorCode.ERROR102.getCode());
|
|
|
if (code == 0) {
|
|
|
wvpResult.setMsg("点播超时,请稍候重试");
|
|
|
} else if (code == 1) {
|
|
@@ -291,12 +291,12 @@ public class PlayServiceImpl implements IPlayService {
|
|
|
msg.setKey(DeferredResultHolder.CALLBACK_CMD_PLAY + device.getDeviceId() + channelId);
|
|
|
//端口获取失败的ssrcInfo 没有必要发送点播指令
|
|
|
if (ssrcInfo.getPort() <= 0) {
|
|
|
- logger.info("[点播端口分配异常],deviceId={},channelId={},ssrcInfo={}", device.getDeviceId(), channelId, ssrcInfo);
|
|
|
+ logger.info("[点播端口分配异常] 可能是流已经创建未销毁成功,deviceId={},channelId={},ssrcInfo={}", device.getDeviceId(), channelId, ssrcInfo);
|
|
|
dynamicTask.stop(timeOutTaskKey);
|
|
|
// 释放ssrc
|
|
|
mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
|
|
|
streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
|
|
|
- msg.setData(WVPResult.fail(ErrorCode.ERROR100.getCode(), "点播端口分配异常"));
|
|
|
+ msg.setData(WVPResult.fail(ErrorCode.ERROR101.getCode(), "点播端口分配异常, 流未销毁成功"));
|
|
|
resultHolder.invokeAllResult(msg);
|
|
|
return;
|
|
|
}
|