ljydlv
/
VideoStream
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

内存泄漏问题,注释日志输出

This commit is contained in:
lijun 2025-01-18 16:08:07 +08:00
parent 1d48452f23
commit 69f81addeb
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
service/tool.go
View File

@ -5,7 +5,6 @@ import (
"VideoStream/proto" "VideoStream/proto"
"VideoStream/worker" "VideoStream/worker"
"fmt" "fmt"
"github.com/ulule/deepcopier"
"gocv.io/x/gocv" "gocv.io/x/gocv"
"image" "image"
"image/color" "image/color"
@ -79,20 +78,13 @@ func SetDeviceCurrentFrameV2(frame *gocv.Mat, device_id int) error {
// log.Printf("设备:%d, 错误: 无法设置帧,err: %s \n", device_id, err.Error()) // log.Printf("设备:%d, 错误: 无法设置帧,err: %s \n", device_id, err.Error())
//} //}
//查看帧状态 //查看帧状态
log.Printf("frame:%v,Device1CurrentFrame:%v \n", (*frame).Empty(), Device1CurrentFrame.Empty()) //log.Printf("frame:%v,Device1CurrentFrame:%v \n", (*frame).Empty(), Device1CurrentFrame.Empty())
//Device1CurrentFrame = *frame //Device1CurrentFrame = *frame
case 50: case 50:
//err := Device50CurrentFrame.Close() if Device50CurrentFrame.Empty() {
//if err != nil { Device50CurrentFrame = gocv.NewMatWithSize((*frame).Rows(), (*frame).Cols(), (*frame).Type())
// log.Printf("设备:%d, 错误: 无法关闭帧\n", device_id)
//}
//Device50CurrentFrame = *frame
err := deepcopier.Copy(*frame).To(&Device50CurrentFrame)
if err != nil {
log.Printf("设备:%d, 错误: 无法设置帧,err: %s \n", device_id, err.Error())
} }
//查看帧状态 (*frame).CopyTo(&Device50CurrentFrame)
log.Printf("frame:%v,Device50CurrentFrame:%v \n", (*frame).Empty(), Device50CurrentFrame.Empty())
} }
frame_count, ok := DeviceFrameCount.Load(device_id) frame_count, ok := DeviceFrameCount.Load(device_id)
if !ok { if !ok {
@ -172,13 +164,13 @@ func GetDeviceCurrentFrameV3(deviceId int) (gocv.Mat, int) {
frame = gocv.NewMatWithSize(Device1CurrentFrame.Rows(), Device1CurrentFrame.Cols(), Device1CurrentFrame.Type()) frame = gocv.NewMatWithSize(Device1CurrentFrame.Rows(), Device1CurrentFrame.Cols(), Device1CurrentFrame.Type())
Device1CurrentFrame.CopyTo(&frame) Device1CurrentFrame.CopyTo(&frame)
//查看帧状态 //查看帧状态
log.Printf("frame:%v,Device1CurrentFrame:%v \n", frame.Empty(), Device1CurrentFrame.Empty()) //log.Printf("frame:%v,Device1CurrentFrame:%v \n", frame.Empty(), Device1CurrentFrame.Empty())
case 50: case 50:
frame = gocv.NewMatWithSize(Device50CurrentFrame.Rows(), Device50CurrentFrame.Cols(), Device50CurrentFrame.Type()) frame = gocv.NewMatWithSize(Device50CurrentFrame.Rows(), Device50CurrentFrame.Cols(), Device50CurrentFrame.Type())
Device50CurrentFrame.CopyTo(&frame) Device50CurrentFrame.CopyTo(&frame)
//查看帧状态 //查看帧状态
log.Printf("frame:%v,Device50CurrentFrame:%v\n", frame.Empty(), Device50CurrentFrame.Empty()) //log.Printf("frame:%v,Device50CurrentFrame:%v\n", frame.Empty(), Device50CurrentFrame.Empty())
} }
@ -191,7 +183,7 @@ func GetDeviceCurrentFrameV3(deviceId int) (gocv.Mat, int) {
log.Printf("DeviceFrameCount 存储的不是 int 类型，device_id: %d", deviceId) log.Printf("DeviceFrameCount 存储的不是 int 类型，device_id: %d", deviceId)
} }
//查看地址 //查看地址
log.Printf("frame:%p,Device1CurrentFrame:%p,Device50CurrentFrame:%p\n", &frame, &Device1CurrentFrame, &Device50CurrentFrame) //log.Printf("frame:%p,Device1CurrentFrame:%p,Device50CurrentFrame:%p\n", &frame, &Device1CurrentFrame, &Device50CurrentFrame)
return frame, frame_count return frame, frame_count
} }
func GetDeviceCurrentFrame(deviceId int) (gocv.Mat, int) { func GetDeviceCurrentFrame(deviceId int) (gocv.Mat, int) {