Browse Source

代码修改

gao.qiang 1 year atrás
parent
commit
769828b49a

+ 6 - 3
business-service/src/main/java/com/ozs/utils/CameraUtil.java

@@ -746,7 +746,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
             @Override
             public String call() throws Exception {
                 // 执行网络请求...
-                log.info(ffmpegPath + " -re -i /opt/streams/compress/" + code + ".mp4  -c:v copy -c:a copy -f flv " + rtmpUrl + "/live/" + code);
+                log.info(ffmpegPath + " -re -i /opt/streams/compress/70b0bd685b0d4df1b4faf74ff5c1e7fd.mp4  -c:v copy -c:a copy -f flv rtmp://10.48.36.47:1935/live/70b0bd685b0d4df1b4faf74ff5c1e7fd");
                 cmdCameraUtil.cmd(ffmpegPath + " -re -i /opt/streams/compress/" + code + ".mp4  -c:v copy -c:a copy -f flv " + rtmpUrl + "/live/" + code);
                 return "Response";
             }
@@ -770,8 +770,11 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
      */
     public void videoCompression(String code) {
         // 执行网络请求...
-        log.info(ffmpegPath + " -i /opt/streams/map/" + code + ".mp4 -c:v libx264 -s 640x480 -c:a adpcm_swf -ar 44100 /opt/streams/compress/" + code + ".mp4");
-        cmdCameraUtil.cmd(ffmpegPath + " -i /opt/streams/map/" + code + ".mp4 -c:v libx264 -s 640x480 -c:a adpcm_swf -ar 44100 /opt/streams/compress/" + code + ".mp4");
+        /**
+         * /usr/bin/ffmpeg -i /opt/streams/map/70b0bd685b0d4df1b4faf74ff5c1e7fd.mp4 -c:v libx264 -s 640x480 -c:a aac -ar 44100 /opt/streams/compress/70b0bd685b0d4df1b4faf74ff5c1e7fd.mp4
+         */
+        log.info(ffmpegPath + " -i /opt/streams/map/" + code + ".mp4 -c:v libx264 -s 640x480 -c:a aac -ar 44100 /opt/streams/compress/" + code + ".mp4");
+        cmdCameraUtil.cmd(ffmpegPath + " -i /opt/streams/map/" + code + ".mp4 -c:v libx264 -s 640x480 -c:a aac -ar 44100 /opt/streams/compress/" + code + ".mp4");
     }
 
 

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

@@ -164,7 +164,7 @@ minio:
   endpoint: http://10.48.36.43:18801 #Minio服务所在地址
   bucketName: picbucket #存储桶名称
   accessKey: admin #访问的key
-  secretKey: admin123 #访问的秘钥
+  secretKey: jt73W-+xhd5 #访问的秘钥
 
 sdk:
   publish: http://10.48.36.43:18810/sdk/publish