소스 검색

代码修改

gao.qiang 1 년 전
부모
커밋
f5a7f6bdc3
2개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 4 4
      vehicle-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java
  2. 1 1
      vehicle-admin/src/main/resources/application.yml

+ 4 - 4
vehicle-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -706,9 +706,9 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
     /**
      * HTTP流转RTSP流
      */
-    public   void streamConversion(String code) {
-        log.info(ffmpegPath+" -re -i /opt/streams/file/"+code+".mp4  -c:v copy -c:a copy -f rtsp rtsp://124.70.58.209:8554/live/"+code);
-        cmdCameraUtil.cmd(ffmpegPath+" -re -i /opt/streams/file/"+code+".mp4  -c:v copy -c:a copy -f rtsp rtsp://124.70.58.209:8554/live/"+code);
+    public void streamConversion(String code) {
+        log.info(ffmpegPath + " -re -i /opt/streams/file/" + code + ".mp4  -c:v copy -c:a copy -f rtsp rtsp://124.70.58.209:8554/live/" + code);
+        cmdCameraUtil.cmd(ffmpegPath + " -re -i /opt/streams/file/" + code + ".mp4  -c:v copy -c:a copy -f rtsp rtsp://124.70.58.209:8554/live/" + code);
 
 //        try {
 //            Process proc = Runtime.getRuntime().exec("/bin/bash", null, null);
@@ -742,7 +742,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
 //        }
 
     }
-    
+
 
     public static List<Map<String, Object>> filterRecordList(String channel,
                                                              Date startTm,

+ 1 - 1
vehicle-admin/src/main/resources/application.yml

@@ -19,7 +19,7 @@ base:
   dbname: vehicle #数据库名
   #图片路径前缀
   imgUrl: http://124.71.171.71:18801/picbucket
-  ffmpegPath: /usr/local/bin/ffmpeg
+  ffmpegPath: /usr/local/ffmpeg/bin/ffmpeg
   filePath: /opt/streams/record/flv/
   webUrl: http://124.70.58.209:18812
   bakUrl: http://124.70.58.209:18891