Browse Source

修复兼容接口

pull/31/head
648540858 4 years ago
parent
commit
d58064587d
  1. 2
      src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java
  2. 1
      src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
  3. 122
      src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
  4. 6
      src/main/resources/application-dev.yml

2
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java

@ -31,7 +31,7 @@ import com.genersoft.iot.vmp.gb28181.transmit.response.ISIPResponseProcessor;
@Component @Component
public class InviteResponseProcessor implements ISIPResponseProcessor { public class InviteResponseProcessor implements ISIPResponseProcessor {
private final static Logger logger = LoggerFactory.getLogger(SIPProcessorFactory.class); private final static Logger logger = LoggerFactory.getLogger(InviteResponseProcessor.class);
/** /**
* 处理invite响应 * 处理invite响应

1
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java

@ -87,6 +87,7 @@ public interface IVideoManagerStorager {
* @return * @return
*/ */
public List<DeviceChannel> queryChannelsByDeviceId(String deviceId); public List<DeviceChannel> queryChannelsByDeviceId(String deviceId);
/** /**
* 获取某个设备的通道 * 获取某个设备的通道
* @param deviceId 设备ID * @param deviceId 设备ID

122
src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java

@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;
/** /**
* 兼容LiveGBS的API实时直播 * 兼容LiveGBS的API实时直播
@ -40,6 +41,10 @@ public class ApiStreamController {
@Autowired @Autowired
private ZLMRESTfulUtils zlmresTfulUtils; private ZLMRESTfulUtils zlmresTfulUtils;
@Autowired
private PlayController playController;
/** /**
* 实时直播 - 开始直播 * 实时直播 - 开始直播
* @param serial 设备编号 * @param serial 设备编号
@ -54,7 +59,7 @@ public class ApiStreamController {
* @return * @return
*/ */
@RequestMapping(value = "/start") @RequestMapping(value = "/start")
private JSONObject start(String serial , private DeferredResult<JSONObject> start(String serial ,
@RequestParam(required = false)Integer channel , @RequestParam(required = false)Integer channel ,
@RequestParam(required = false)String code, @RequestParam(required = false)String code,
@RequestParam(required = false)String cdn, @RequestParam(required = false)String cdn,
@ -65,113 +70,39 @@ public class ApiStreamController {
@RequestParam(required = false)String timeout @RequestParam(required = false)String timeout
){ ){
int getEncoding = closeWaitRTPInfo? 1: 0; DeferredResult<JSONObject> resultDeferredResult = new DeferredResult<JSONObject>();
Device device = storager.queryVideoDevice(serial); Device device = storager.queryVideoDevice(serial);
if (device == null ) { if (device == null ) {
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
result.put("error","device[ " + serial + " ]未找到"); result.put("error","device[ " + serial + " ]未找到");
return result; resultDeferredResult.setResult(result);
}else if (device.getOnline() == 0) { }else if (device.getOnline() == 0) {
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
result.put("error","device[ " + code + " ]offline"); result.put("error","device[ " + code + " ]offline");
return result; resultDeferredResult.setResult(result);
} }
resultDeferredResult.onTimeout(()->{
logger.info("播放等待超时");
JSONObject result = new JSONObject();
result.put("error","timeout");
resultDeferredResult.setResult(result);
});
DeviceChannel deviceChannel = storager.queryChannel(serial, code); DeviceChannel deviceChannel = storager.queryChannel(serial, code);
if (deviceChannel == null) { if (deviceChannel == null) {
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
result.put("error","channel[ " + code + " ]未找到"); result.put("error","channel[ " + code + " ]未找到");
return result; resultDeferredResult.setResult(result);
}else if (deviceChannel.getStatus() == 0) { }else if (deviceChannel.getStatus() == 0) {
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
result.put("error","channel[ " + code + " ]offline"); result.put("error","channel[ " + code + " ]offline");
return result; resultDeferredResult.setResult(result);
}
// 查询是否已经在播放
StreamInfo streamInfo = storager.queryPlayByDevice(device.getDeviceId(), code);
if (streamInfo == null) {
logger.debug("streamInfo 等于null, 重新点播");
// streamInfo = cmder.playStreamCmd(device, code);
}else {
logger.debug("streamInfo 不等于null, 向流媒体查询是否正在推流");
String streamId = streamInfo.getStreamId();
JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
if (rtpInfo.getBoolean("exist")) {
logger.debug("向流媒体查询正在推流, 直接返回: " + streamInfo.getRtsp());
JSONObject result = new JSONObject();
result.put("StreamID", streamInfo.getStreamId());
result.put("DeviceID", device.getDeviceId());
result.put("ChannelID", code);
result.put("ChannelName", deviceChannel.getName());
result.put("ChannelCustomName", "");
result.put("FLV", streamInfo.getFlv());
result.put("WS_FLV", streamInfo.getWs_flv());
result.put("RTMP", streamInfo.getRtmp());
result.put("HLS", streamInfo.getHls());
result.put("RTSP", streamInfo.getRtsp());
result.put("CDN", "");
result.put("SnapURL", "");
result.put("Transport", device.getTransport());
result.put("StartAt", "");
result.put("Duration", "");
result.put("SourceVideoCodecName", "");
result.put("SourceVideoWidth", "");
result.put("SourceVideoHeight", "");
result.put("SourceVideoFrameRate", "");
result.put("SourceAudioCodecName", "");
result.put("SourceAudioSampleRate", "");
result.put("AudioEnable", "");
result.put("Ondemand", "");
result.put("InBytes", "");
result.put("InBitRate", "");
result.put("OutBytes", "");
result.put("NumOutputs", "");
result.put("CascadeSize", "");
result.put("RelaySize", "");
result.put("ChannelPTZType", 0);
return result;
} else {
logger.debug("向流媒体查询没有推流, 重新点播");
storager.stopPlay(streamInfo);
// streamInfo = cmder.playStreamCmd(device, code);
}
} }
DeferredResult<ResponseEntity<String>> play = playController.play(serial, code);
if (logger.isDebugEnabled()) { play.setResultHandler((Object o)->{
logger.debug(String.format("设备预览 API调用,deviceId:%s ,channelId:%s",serial, code)); ResponseEntity<String> responseEntity = (ResponseEntity)o;
logger.debug("设备预览 API调用,streamId:"+streamInfo.getStreamId()); StreamInfo streamInfo = JSON.parseObject(responseEntity.getBody(), StreamInfo.class);
}
boolean lockFlag = true;
long startTime = System.currentTimeMillis();
while (lockFlag) {
try {
if (System.currentTimeMillis() - startTime > 10 * 1000) {
storager.stopPlay(streamInfo);
logger.info("播放等待超时");
JSONObject result = new JSONObject();
result.put("error","timeout");
return result;
} else {
StreamInfo streamInfoNow = storager.queryPlayByDevice(serial, code);
logger.debug("正在向流媒体查询");
if (streamInfoNow != null && streamInfoNow.getFlv() != null) {
streamInfo = streamInfoNow;
logger.debug("向流媒体查询到: " + streamInfoNow.getRtsp());
lockFlag = false;
continue;
} else {
Thread.sleep(2000);
continue;
}
}
} catch (InterruptedException e) {
e.printStackTrace();
}
}
if(streamInfo!=null) {
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
result.put("StreamID", streamInfo.getStreamId()); result.put("StreamID", streamInfo.getStreamId());
result.put("DeviceID", device.getDeviceId()); result.put("DeviceID", device.getDeviceId());
@ -203,13 +134,9 @@ public class ApiStreamController {
result.put("CascadeSize", ""); result.put("CascadeSize", "");
result.put("RelaySize", ""); result.put("RelaySize", "");
result.put("ChannelPTZType", 0); result.put("ChannelPTZType", 0);
return result; resultDeferredResult.setResult(result);
} else { });
logger.warn("设备预览API调用失败!"); return resultDeferredResult;
JSONObject result = new JSONObject();
result.put("error","调用失败");
return result;
}
} }
/** /**
@ -228,6 +155,7 @@ public class ApiStreamController {
@RequestParam(required = false)String check_outputs @RequestParam(required = false)String check_outputs
){ ){
StreamInfo streamInfo = storager.queryPlayByDevice(serial, code); StreamInfo streamInfo = storager.queryPlayByDevice(serial, code);
if (streamInfo == null) { if (streamInfo == null) {
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();

6
src/main/resources/application-dev.yml

@ -69,11 +69,7 @@ media:
# [可选] zlm服务器的hook.admin_params=secret # [可选] zlm服务器的hook.admin_params=secret
secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc
# [可选] zlm服务器的general.streamNoneReaderDelayMS # [可选] zlm服务器的general.streamNoneReaderDelayMS
streamNoneReaderDelayMS: 600000 # 无人观看多久自动关闭流 streamNoneReaderDelayMS: 600000 # 无人观看多久自动关闭流, -1表示永不自动关闭,即 关闭按需拉流
# [可选] 关闭等待收到流编码信息后在返回,
# 设为false可以获得更好的兼容性,保证返回后流就可以播放,
# 设为true可以快速打开播放窗口,可以获得更好的体验
closeWaitRTPInfo: false
# [可选] 自动点播, 使用固定流地址进行播放时,如果未点播则自动进行点播 # [可选] 自动点播, 使用固定流地址进行播放时,如果未点播则自动进行点播
autoApplyPlay: true autoApplyPlay: true
# 启用udp多端口模式, 详细解释参考: https://github.com/xia-chu/ZLMediaKit/wiki/GB28181%E6%8E%A8%E6%B5%81 下的高阶使用 # 启用udp多端口模式, 详细解释参考: https://github.com/xia-chu/ZLMediaKit/wiki/GB28181%E6%8E%A8%E6%B5%81 下的高阶使用

Loading…
Cancel
Save