|
@@ -363,6 +363,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
|
|
|
CamerasVo camerasVo = new CamerasVo();
|
|
|
camerasVo.setCameraIndexCode(cameraCode);
|
|
|
String urLs = previewURLs(camerasVo, channel);
|
|
|
+ log.info("web实时流---"+urLs);
|
|
|
if (!urLs.contains("无视频")) {
|
|
|
return getPlayFlv(cameraCode, channel, true, urLs);
|
|
|
}else {
|
|
@@ -373,6 +374,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
|
|
|
CamerasVo camerasVo = new CamerasVo();
|
|
|
camerasVo.setCameraIndexCode(cameraCode);
|
|
|
String urLs = previewURLs(camerasVo, channel);
|
|
|
+ log.info("web实时流---"+urLs);
|
|
|
if (!urLs.contains("无视频")) {
|
|
|
return getPlayFlv(cameraCode, channel, true, urLs);
|
|
|
}else {
|
|
@@ -382,7 +384,6 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
|
|
|
} else {
|
|
|
CamerasVo camerasVo = new CamerasVo();
|
|
|
camerasVo.setCameraIndexCode(cameraCode);
|
|
|
- previewURLs(camerasVo, channel);
|
|
|
String urLs = previewURLs(camerasVo, channel);
|
|
|
if (!urLs.contains("无视频")) {
|
|
|
return getPlayFlv(cameraCode, channel, true, urLs);
|