From 0dcba4fd1cb536ab426622e31213d8a0194449ff Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 25 四月 2025 14:12:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/JavaCVStreamUtil.java | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/JavaCVStreamUtil.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/JavaCVStreamUtil.java index bc7a407..0b80278 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/JavaCVStreamUtil.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/JavaCVStreamUtil.java @@ -2,14 +2,11 @@ import cn.hutool.core.io.FileUtil; import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.system.service.ICarService; import org.bytedeco.ffmpeg.global.avcodec; import org.bytedeco.ffmpeg.global.avutil; import org.bytedeco.javacv.*; -import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; -import javax.annotation.Resource; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -31,11 +28,13 @@ private static Map<Integer, Boolean> statusMap = new ConcurrentHashMap<>(); - @Resource - private RedisTemplate redisTemplate; - @Resource - private ICarService carService; + public static void main(String[] args) { + String url = "rtmp://127.0.0.1:1935/flv/test"; + JavaCVStreamUtil.push_flv("C:\\Users\\39373\\Desktop\\图片\\trailer.mp4", url, 0); + } + + /** @@ -54,7 +53,6 @@ OpenCVFrameGrabber openCVFrameGrabber = grabberMap1.get(deviceNumber); if (null != openCVFrameGrabber) { openCVFrameGrabber.close(); - ; } FFmpegFrameRecorder fFmpegFrameRecorder = frameRecorderMap.get(deviceNumber); if (null != fFmpegFrameRecorder) { -- Gitblit v1.7.1