v4

2025-10-07 16:50:59 +08:00 · 2023-01-27 17:33:39 +08:00
parent 5460988430
commit e08a1a6a3d
4 changed files with 597 additions and 191 deletions
--- a/device_list.go
+++ b/device_list.go
@@ -1,75 +1,74 @@
-package onvif
-
-import (
-	"strings"
-
-	. "github.com/Monibuca/engine/v3"
-	rtsp "github.com/Monibuca/plugin-rtsp/v3"
-	. "github.com/Monibuca/utils/v3"
-	"github.com/aler9/gortsplib"
-	lonvif "github.com/liyanhui1998/go-onvif"
-)
-
-type DeviceList struct {
-	Data map[string]map[string]*DeviceStatus
-}
-
-func (dl *DeviceList) discoveryDevice() {
-	for _, i := range config.Interfaces {
-		deviceParams := WsDiscover(i.InterfaceName, authCfg)
-
-		devsMap, ok := dl.Data[i.InterfaceName]
-		if !ok {
-			devsMap = make(map[string]*DeviceStatus)
-			dl.Data[i.InterfaceName] = devsMap
-		}
-
-		for _, dParam := range deviceParams {
-			// 如果已经存在，则不再添加
-			if _, ok := devsMap[dParam.Ipddr]; ok {
-				continue
-			}
-			var dev *lonvif.Device
-			devStatus := &DeviceStatus{}
-			dev, err := lonvif.NewDevice(dParam)
-			if err == nil {
-				devStatus.Device = dev
-				devStatus.Status = StatusInitOk
-			} else {
-				devStatus.Status = StatusInitError
-				devStatus.Device = &lonvif.Device{
-					Params: dParam,
-				}
-			}
-			devsMap[dParam.Ipddr] = devStatus
-		}
-	}
-}
-
-func (dl *DeviceList) pullStream() {
-	for _, devicesMap := range dl.Data {
-		for _, d := range devicesMap {
-			streamPath := strings.ReplaceAll(d.Device.Params.Ipddr, ".", "_")
-			streamPath = "onvif/" + strings.ReplaceAll(streamPath, ":", "_")
-			//避免重复拉流
-			if FindStream(streamPath) != nil {
-				continue
-			}
-			rtspUrl, err := GetStreamUri(d.Device)
-			if err != nil {
-				Printf("[ONVIF] get stream err:", err)
-				d.Status = StatusGetStreamUriError
-				continue
-			}
-			d.Status = StatusGetStreamUriOk
-			go func(targetURL string, streamPath string, d *DeviceStatus) {
-				err := (&rtsp.RTSPClient{Transport: gortsplib.TransportTCP}).PullStream(streamPath, targetURL)
-				if err == nil {
-					d.Status = StatusPullRtspOk
-				} else {
-					d.Status = StatusPullRtspError
-				}
-			}(rtspUrl, streamPath, d)
-		}
-	}
-}
+package onvif
+
+import (
+	"m7s.live/engine/v4"
+	"m7s.live/engine/v4/log"
+	"strings"
+
+	lonvif "github.com/liyanhui1998/go-onvif"
+	rtsp "m7s.live/plugin/rtsp/v4"
+)
+
+type DeviceList struct {
+	Data map[string]map[string]*DeviceStatus
+}
+
+func (dl *DeviceList) discoveryDevice() {
+	for _, i := range conf.Interfaces {
+		deviceParams := WsDiscover(i.InterfaceName, authCfg)
+
+		devsMap, ok := dl.Data[i.InterfaceName]
+		if !ok {
+			devsMap = make(map[string]*DeviceStatus)
+			dl.Data[i.InterfaceName] = devsMap
+		}
+
+		for _, dParam := range deviceParams {
+			// 如果已经存在，则不再添加
+			if _, ok := devsMap[dParam.Ipddr]; ok {
+				continue
+			}
+			var dev *lonvif.Device
+			devStatus := &DeviceStatus{}
+			dev, err := lonvif.NewDevice(dParam)
+			if err == nil {
+				devStatus.Device = dev
+				devStatus.Status = StatusInitOk
+			} else {
+				devStatus.Status = StatusInitError
+				devStatus.Device = &lonvif.Device{
+					Params: dParam,
+				}
+			}
+			devsMap[dParam.Ipddr] = devStatus
+		}
+	}
+}
+
+func (dl *DeviceList) pullStream() {
+	for _, devicesMap := range dl.Data {
+		for _, d := range devicesMap {
+			streamPath := strings.ReplaceAll(d.Device.Params.Ipddr, ".", "_")
+			streamPath = "onvif/" + strings.ReplaceAll(streamPath, ":", "_")
+			//避免重复拉流
+			if engine.Streams.Has(streamPath) {
+				continue
+			}
+			rtspUrl, err := GetStreamUri(d.Device)
+			if err != nil {
+				log.Info("[ONVIF] get stream err:", err)
+				d.Status = StatusGetStreamUriError
+				continue
+			}
+			d.Status = StatusGetStreamUriOk
+			go func(targetURL string, streamPath string, d *DeviceStatus) {
+				err = rtsp.RTSPPlugin.Pull(streamPath, targetURL, new(rtsp.RTSPPuller), 0)
+				if err == nil {
+					d.Status = StatusPullRtspOk
+				} else {
+					d.Status = StatusPullRtspError
+				}
+			}(rtspUrl, streamPath, d)
+		}
+	}
+}