临时提交

This commit is contained in:
648540858
2024-07-09 17:55:51 +08:00
parent 2235caca36
commit 046e7802f3
14 changed files with 295 additions and 170 deletions

View File

@@ -10,6 +10,7 @@ import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.media.bean.MediaServer;
import com.genersoft.iot.vmp.service.IDeviceChannelService;
import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.service.IInviteStreamService;
import com.genersoft.iot.vmp.service.IPlayService;
@@ -46,6 +47,9 @@ public class ApiStreamController {
@Autowired
private IDeviceService deviceService;
@Autowired
private IDeviceChannelService deviceChannelService;
@Autowired
private IPlayService playService;
@@ -96,7 +100,7 @@ public class ApiStreamController {
resultJSON.put("error","timeout");
result.setResult(resultJSON);
inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, serial, code);
storager.stopPlay(serial, code);
deviceChannelService.stopPlay(serial, code);
// 清理RTP server
});
@@ -240,7 +244,7 @@ public class ApiStreamController {
return result;
}
inviteStreamService.removeInviteInfo(inviteInfo);
storager.stopPlay(inviteInfo.getDeviceId(), inviteInfo.getChannelId());
deviceChannelService.stopPlay(inviteInfo.getDeviceId(), inviteInfo.getChannelId());
return null;
}