Shikong/gb28181-docking-platform-proxy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

downloadToStream 添加 -t 参数

Browse Source 
/video ffmpegRecord 调整
This commit is contained in:
shikong 2024-03-15 10:48:03 +08:00
parent 8c5b6f6021
commit 054ab25205
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/gb28181/Gb28181DownloadService.java
View File

@ -232,6 +232,10 @@ public class Gb28181DownloadService {
} else if (wvpProxyConfig.getUseFfmpeg()) { } else if (wvpProxyConfig.getUseFfmpeg()) {
executor.execute(()-> { executor.execute(()-> {
videoService.ffmpegRecord(asyncResponse, videoInfo.getUrl(), DateUtil.between(startTime, endTime, DateUnit.SECOND), videoInfo.getDevice(), videoInfo.getCallId()); videoService.ffmpegRecord(asyncResponse, videoInfo.getUrl(), DateUtil.between(startTime, endTime, DateUnit.SECOND), videoInfo.getDevice(), videoInfo.getCallId());
DateTime end = DateUtil.date();
asyncContext.complete();
log.info("下载总耗时: {}, deviceCode {}, startTime {}, endTime {}", DateUtil.between(start,end, DateUnit.SECOND), deviceCode, DateUtil.formatDateTime(startTime), DateUtil.formatDateTime(endTime));
}); });
} else { } else {
videoService.javaCVrecord(asyncResponse, videoInfo.getUrl(), DateUtil.between(startTime, endTime, DateUnit.SECOND) + 15); videoService.javaCVrecord(asyncResponse, videoInfo.getUrl(), DateUtil.between(startTime, endTime, DateUnit.SECOND) + 15);
@ -240,9 +244,11 @@ public class Gb28181DownloadService {
} catch(Exception e) { } catch(Exception e) {
writeErrorToResponse(asyncResponse, JsonResponse.error(e.getMessage())); writeErrorToResponse(asyncResponse, JsonResponse.error(e.getMessage()));
} finally { } finally {
DateTime end = DateUtil.date(); if(!wvpProxyConfig.getUseFfmpeg()){
asyncContext.complete(); DateTime end = DateUtil.date();
log.info("下载总耗时: {}, deviceCode {}, startTime {}, endTime {}", DateUtil.between(start,end, DateUnit.SECOND), deviceCode, DateUtil.formatDateTime(startTime), DateUtil.formatDateTime(endTime)); asyncContext.complete();
log.info("下载总耗时: {}, deviceCode {}, startTime {}, endTime {}", DateUtil.between(start,end, DateUnit.SECOND), deviceCode, DateUtil.formatDateTime(startTime), DateUtil.formatDateTime(endTime));
}
} }
}); });
} }
@ -373,6 +379,10 @@ public class Gb28181DownloadService {
} else if(wvpProxyConfig.getUseFfmpeg()){ } else if(wvpProxyConfig.getUseFfmpeg()){
executor.execute(()->{ executor.execute(()->{
videoService.ffmpegRecord(asyncResponse, videoInfo.getUrl(), DateUtil.between(startTime,endTime,DateUnit.SECOND),videoInfo.getDevice(),videoInfo.getCallId()); videoService.ffmpegRecord(asyncResponse, videoInfo.getUrl(), DateUtil.between(startTime,endTime,DateUnit.SECOND),videoInfo.getDevice(),videoInfo.getCallId());
DateTime end = DateUtil.date();
asyncContext.complete();
log.info("下载总耗时: {}, deviceCode {}, startTime {}, endTime {}", DateUtil.between(start,end, DateUnit.SECOND), deviceCode, DateUtil.formatDateTime(startTime), DateUtil.formatDateTime(endTime));
}); });
} else { } else {
videoService.javaCVrecord(asyncResponse, videoInfo.getUrl(), DateUtil.between(startTime,endTime,DateUnit.SECOND) + 15); videoService.javaCVrecord(asyncResponse, videoInfo.getUrl(), DateUtil.between(startTime,endTime,DateUnit.SECOND) + 15);
@ -382,9 +392,11 @@ public class Gb28181DownloadService {
writeErrorToResponse(asyncResponse, JsonResponse.error(e.getMessage())); writeErrorToResponse(asyncResponse, JsonResponse.error(e.getMessage()));
} finally { } finally {
DateTime end = DateUtil.date(); if(!wvpProxyConfig.getUseFfmpeg()){
asyncContext.complete(); DateTime end = DateUtil.date();
log.info("下载总耗时: {}, deviceCode {}, startTime {}, endTime {}", DateUtil.between(start,end, DateUnit.SECOND), deviceCode, DateUtil.formatDateTime(startTime), DateUtil.formatDateTime(endTime)); asyncContext.complete();
log.info("下载总耗时: {}, deviceCode {}, startTime {}, endTime {}", DateUtil.between(start,end, DateUnit.SECOND), deviceCode, DateUtil.formatDateTime(startTime), DateUtil.formatDateTime(endTime));
}
} }
}); });
} }