|
@@ -257,7 +257,7 @@ public class DahCameraExecuteApi {
|
|
|
/*
|
|
|
* 根据监控点获取回放流地址
|
|
|
*/
|
|
|
- public ResultClass GetCameraPlaybackURL(Camera dahCamera) {
|
|
|
+ public ResultClass GetCameraPlaybackURL(Camera dahCamera, boolean isHls) {
|
|
|
logger.info("调用大华视频回放接口,入参 = " + dahCamera);
|
|
|
long start = System.currentTimeMillis();
|
|
|
try {
|
|
@@ -317,13 +317,13 @@ public class DahCameraExecuteApi {
|
|
|
+ "/totallength/" + totalLength + "/begintime/" + startSeconds + "/endtime/" + endSeconds + ".m3u8";
|
|
|
|
|
|
logger.info("调用大华视频回放接口,视频回放地址拼接完成,url = " + playBackUrl);
|
|
|
-
|
|
|
-// Map<String, String> map = new HashMap<String, String>();
|
|
|
-// map.put("url", playBackUrl);
|
|
|
-//
|
|
|
-// resultClass.name = true;
|
|
|
-// resultClass.resultData = map;
|
|
|
-// return resultClass;
|
|
|
+ if (isHls) {
|
|
|
+ Map<String, String> map = new HashMap<String, String>();
|
|
|
+ map.put("url", playBackUrl);
|
|
|
+ resultClass.name = true;
|
|
|
+ resultClass.resultData = map;
|
|
|
+ return resultClass;
|
|
|
+ }
|
|
|
|
|
|
/*
|
|
|
* 抓取hls转成mp4
|