From 69f81addebdaaa8c9aac8bb39e5757250295d3df Mon Sep 17 00:00:00 2001
From: lijun <lijun@xiaoduotech.com>
Date: Sat, 18 Jan 2025 16:08:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E5=AD=98=E6=B3=84=E6=BC=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98,=E6=B3=A8=E9=87=8A=E6=97=A5=E5=BF=97=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/tool.go | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/service/tool.go b/service/tool.go
index 5e624c6..29e4857 100644
--- a/service/tool.go
+++ b/service/tool.go
@@ -5,7 +5,6 @@ import (
 	"VideoStream/proto"
 	"VideoStream/worker"
 	"fmt"
-	"github.com/ulule/deepcopier"
 	"gocv.io/x/gocv"
 	"image"
 	"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("frame:%v,Device1CurrentFrame:%v \n", (*frame).Empty(), Device1CurrentFrame.Empty())
+		//log.Printf("frame:%v,Device1CurrentFrame:%v \n", (*frame).Empty(), Device1CurrentFrame.Empty())
 		//Device1CurrentFrame = *frame
 	case 50:
-		//err := Device50CurrentFrame.Close()
-		//if err != nil {
-		//	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())
+		if Device50CurrentFrame.Empty() {
+			Device50CurrentFrame = gocv.NewMatWithSize((*frame).Rows(), (*frame).Cols(), (*frame).Type())
 		}
-		//查看帧状态
-		log.Printf("frame:%v,Device50CurrentFrame:%v \n", (*frame).Empty(), Device50CurrentFrame.Empty())
+		(*frame).CopyTo(&Device50CurrentFrame)
 	}
 	frame_count, ok := DeviceFrameCount.Load(device_id)
 	if !ok {
@@ -172,13 +164,13 @@ func GetDeviceCurrentFrameV3(deviceId int) (gocv.Mat, int) {
 		frame = gocv.NewMatWithSize(Device1CurrentFrame.Rows(), Device1CurrentFrame.Cols(), Device1CurrentFrame.Type())
 		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:
 		frame = gocv.NewMatWithSize(Device50CurrentFrame.Rows(), Device50CurrentFrame.Cols(), Device50CurrentFrame.Type())
 		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("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
 }
 func GetDeviceCurrentFrame(deviceId int) (gocv.Mat, int) {