1、流媒体升级1.2.0，修改部分forest接口 2、登录设备判断编码自动配置转码 3、增加sdk聚焦模式切换 4、增加sdk视场角获取并定时上传

‘liusuyi’

2023-10-21 d353fdce7cb957aa0f5d9d51d0ad4205c96e156c

 ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java

@@ -1,31 +1,18 @@
package com.ruoyi.media.service.impl;

import com.alibaba.fastjson2.JSONObject;
import com.dtflys.forest.Forest;
import com.dtflys.forest.exceptions.ForestNetworkException;
import com.dtflys.forest.exceptions.ForestRuntimeException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.media.domain.*;
import com.ruoyi.media.mapper.VtduMapper;
import com.ruoyi.media.service.IMediaService;
import com.ruoyi.utils.forest.MediaClient;
import com.ruoyi.utils.tools.ArdTool;
import com.ruoyi.utils.process.CmdUtils;
import com.sun.jna.Platform;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.core.annotation.Order;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;

import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.annotation.Resource;
import java.io.File;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -65,34 +52,27 @@
        String rtmpUrl = "rtmp://" + mediamtxHost + ":1935/" + name;
        String webrtcUrl = "http://" + mediamtxHost + ":8889/" + name;

        Conf mediaInfo = new Conf();
        Conf conf = new Conf();
        String rootPath = System.getProperty("user.dir").replaceAll("\\\\", "/") + "/lib/mediamtx/";
        if (isCode.equals("1")) {
            mediaInfo.setSource("publisher");
            conf.setSource("publisher");
            //默认软解码
            String cmd = "ffmpeg -rtsp_transport tcp -i " + sourceUrl + " -vcodec libx264 -preset:v ultrafast -r 25 -keyint_min 25 -g 60 -sc_threshold 0 -threads 6  -b:v 2048k -acodec opus  -strict -2 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
            if (mode.equals("0")) {//硬解码
                cmd = "ffmpeg -hwaccel cuvid -c:v hevc_cuvid  -rtsp_transport tcp  -i " + sourceUrl + " -c:v h264_nvenc  -r 25 -g 60 -sc_threshold 0 -threads 6  -b:v 2048k -bf 0 -acodec opus  -strict -2 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
            }
            mediaInfo.setRunondemand(cmd);
            mediaInfo.setRunondemandrestart(true);
            mediaInfo.setRunondemandcloseafter("5s");
            conf.setRunOnDemand(cmd);
            conf.setRunOnDemandRestart(true);
            conf.setRunOnDemandCloseAfter("5s");
        } else {
            mediaInfo.setSource(sourceUrl);
            mediaInfo.setSourceondemand(true);
            conf.setSource(sourceUrl);
            conf.setSourceOnDemand(true);
        }
        mediaInfo.setMaxReaders(100);
        mediaInfo.setSourceprotocol("tcp");
        conf.setMaxReaders(100);
        conf.setSourceProtocol("tcp");

        List<String> nameList = new ArrayList<>();
        String paths = mediaClient.paths();
        JsonsRoot jsonsRoot = JSONObject.parseObject(paths, JsonsRoot.class);
        List<Items> items = jsonsRoot.getItems();
        for (Items item : items) {
            nameList.add(item.getName());
        }
        if (!nameList.contains(name)) {
            mediaClient.addPath(name, mediaInfo);
        if (!checkNameExist(name)) {
            mediaClient.addPath(name, conf);
        }
        Map<String, String> map = new HashMap<>();
        map.put("rtspUrl", rtspUrl);
@@ -109,26 +89,27 @@
            String rtmpUrl = "rtmp://" + mediamtxHost + ":1935/" + name;
            String webrtcUrl = "http://" + mediamtxHost + ":8889/" + name;

            Conf mediaInfo = new Conf();
            Conf conf = new Conf();
            String rootPath = System.getProperty("user.dir").replaceAll("\\\\", "/") + "/lib/mediamtx/";
            if (isCode.equals("1")) {
                mediaInfo.setSource("publisher");
                conf.setSource("publisher");
                //默认软解码
                String cmd = "ffmpeg -rtsp_transport tcp -i " + sourceUrl + " -vcodec libx264 -preset:v ultrafast -r 25 -keyint_min 25 -g 60 -sc_threshold 0 -threads 6  -b:v 2048k -acodec opus  -strict -2 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
                if (mode.equals("0")) {//硬解码
                    cmd = "ffmpeg -hwaccel cuvid -c:v hevc_cuvid  -rtsp_transport tcp  -i " + sourceUrl + " -c:v h264_nvenc  -r 25 -g 60 -sc_threshold 0 -threads 6  -b:v 2048k -bf 0 -acodec opus  -strict -2 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
                }
                mediaInfo.setRunondemand(cmd);
                mediaInfo.setRunondemandrestart(true);
                mediaInfo.setRunondemandcloseafter("5s");
                conf.setRunOnDemand(cmd);
                conf.setRunOnDemandRestart(true);
                conf.setRunOnDemandCloseAfter("5s");
            } else {
                mediaInfo.setSource(sourceUrl);
                conf.setSource(sourceUrl);
                conf.setSourceOnDemand(true);
            }
            mediaInfo.setMaxReaders(100);
            mediaInfo.setSourceprotocol("tcp");
            conf.setMaxReaders(100);
            conf.setSourceProtocol("tcp");

            if (checkNameExist(name)) {
                mediaClient.editPath(name, mediaInfo);
                mediaClient.editPath(name, conf);
            }

            map.put("rtspUrl", rtspUrl);
@@ -142,18 +123,14 @@

    @Override
    public StreamInfo getPathInfo(String name) {
        Items item = mediaClient.getPathInfo(name);
        Conf conf = mediaClient.getPathInfo(name);
        StreamInfo info = new StreamInfo();
        //ID
        info.setName(name);
        String runOn;
        if (StringUtils.isNotEmpty(item.getConf().getRunondemand())) {
            runOn = item.getConf().getRunondemand();
        String runOn = "";
        if (StringUtils.isNotEmpty(conf.getRunOnDemand())) {
            runOn = conf.getRunOnDemand();
            info.setMode("0");
        } else {
            //runOn = item.getConf().getRunonready();
            runOn = item.getConf().getRunoninit();
            info.setMode("1");
        }
        //RTSP源地址
        Matcher matcher = Pattern.compile("rtsp://[^\\s\"]+").matcher(runOn);
@@ -161,7 +138,7 @@
            info.setRtspSource(matcher.group());
            info.setIsCode("1");
        } else {
            info.setRtspSource(item.getConf().getSource());
            info.setRtspSource(conf.getSource());
            info.setIsCode("0");
        }
        return info;
@@ -170,14 +147,15 @@
    @Override
    public void removePath(String[] names) {
        for (String name : names) {
            if(checkNameExist(name)) {
            mediaClient.removePath(name);}
            if (checkNameExist(name)) {
                mediaClient.removePath(name);
            }
        }
    }

    @Override
    public void removePath(String name) {
        if(checkNameExist(name)) {
        if (checkNameExist(name)) {
            mediaClient.removePath(name);
        }
    }
@@ -193,9 +171,11 @@
            //ID
            String name = item.getName();
            info.setName(name);

            Conf conf = mediaClient.getPathInfo(name);
            String runOn = "";
            if (StringUtils.isNotEmpty(item.getConf().getRunondemand())) {
                runOn = item.getConf().getRunondemand();
            if (StringUtils.isNotEmpty(conf.getRunOnDemand())) {
                runOn = conf.getRunOnDemand();
            }
            //RTSP源地址
            Matcher matcher = Pattern.compile("rtsp://[^\\s\"]+").matcher(runOn);
@@ -203,7 +183,7 @@
                info.setRtspSource(matcher.group());
                info.setIsCode("1");
            } else {
                info.setRtspSource(item.getConf().getSource());
                info.setRtspSource(conf.getSource());
                info.setIsCode("0");
            }
            //传输协议
@@ -216,7 +196,6 @@
        }
        return pathInfoList;
    }


    @Override
    public RtspSession getRtspSessionById(String sessionId) {
@@ -255,6 +234,9 @@
            //ID
            String name = item.getName();
            info.setName(name);

            Conf conf = mediaClient.getPathInfo(name);

            //RTMP播放地址
            String rtmpUrl = "rtmp://" + mediamtxHost + ":1935/" + name;
            info.setRtmpUrl(rtmpUrl);
@@ -291,17 +273,17 @@
            }
            //RTSP源地址
            String runOn = "";
            if (StringUtils.isNotEmpty(item.getConf().getRunondemand())) {
                runOn = item.getConf().getRunondemand();
            if (StringUtils.isNotEmpty(conf.getRunOnDemand())) {
                runOn = conf.getRunOnDemand();
            }
            Matcher matcher = Pattern.compile("rtsp://[^\\s\"]+").matcher(runOn);
            if (matcher.find()) {
                info.setRtspSource(matcher.group());
            } else {
                info.setRtspSource(item.getConf().getSource());
                info.setRtspSource(conf.getSource());
            }
            //传输协议
            info.setProtocol(item.getConf().getSourceprotocol());
            info.setProtocol(conf.getSourceProtocol());
            //拉流数量
            List<Readers> readers = item.getReaders();
            info.setNum(readers.size());
@@ -329,8 +311,9 @@
                //ID
                String name = item.getName();
                info.setName(name);
                Conf conf = mediaClient.getPathInfo(name);
                //传输协议
                info.setProtocol(item.getConf().getSourceprotocol());
                info.setProtocol(conf.getSourceProtocol());

                String type = reader.getType();
                switch (type) {
@@ -461,17 +444,11 @@
    @Override
    public List<String> getNameList() {
        List<String> nameList = new ArrayList<>();
        try {
            String paths = mediaClient.paths();
            JsonsRoot jsonsRoot = JSONObject.parseObject(paths, JsonsRoot.class);
            List<Items> items = jsonsRoot.getItems();
            for (Items item : items) {
                nameList.add(item.getName());
            }
        }
        catch (Exception ex)
        {
            log.error(ex.getMessage());
        String paths = mediaClient.paths();
        JsonsRoot jsonsRoot = JSONObject.parseObject(paths, JsonsRoot.class);
        List<Items> items = jsonsRoot.getItems();
        for (Items item : items) {
            nameList.add(item.getName());
        }
        return nameList;
    }