Compare commits
No commits in common. "87c35223743c62302674a4dfa5d8b5f6a6bd21e9" and "4c1a3977752892e2bd2e5270c964648f70900ab6" have entirely different histories.
87c3522374
...
4c1a397775
|
|
@ -65,16 +65,8 @@ func SetDeviceCurrentFrameV2(frame *gocv.Mat, device_id int) error {
|
||||||
//设置当前帧
|
//设置当前帧
|
||||||
switch device_id {
|
switch device_id {
|
||||||
case 1:
|
case 1:
|
||||||
err := Device1CurrentFrame.Close()
|
|
||||||
if err != nil {
|
|
||||||
log.Printf("设备:%d, 错误: 无法关闭帧\n", device_id)
|
|
||||||
}
|
|
||||||
Device1CurrentFrame = *frame
|
Device1CurrentFrame = *frame
|
||||||
case 50:
|
case 50:
|
||||||
err := Device50CurrentFrame.Close()
|
|
||||||
if err != nil {
|
|
||||||
log.Printf("设备:%d, 错误: 无法关闭帧\n", device_id)
|
|
||||||
}
|
|
||||||
Device50CurrentFrame = *frame
|
Device50CurrentFrame = *frame
|
||||||
}
|
}
|
||||||
frame_count, ok := DeviceFrameCount.Load(device_id)
|
frame_count, ok := DeviceFrameCount.Load(device_id)
|
||||||
|
|
@ -266,11 +258,6 @@ func getVideoFrame(device proto.DeviceInfo) {
|
||||||
log.Printf("设备:%d 错误: 无法设置当前帧,err:%s \n", device.ID, err3.Error())
|
log.Printf("设备:%d 错误: 无法设置当前帧,err:%s \n", device.ID, err3.Error())
|
||||||
}
|
}
|
||||||
z++
|
z++
|
||||||
//关闭帧
|
|
||||||
err4 := frame.Close()
|
|
||||||
if err4 != nil {
|
|
||||||
log.Printf("设备:%d 错误: 无法关闭帧,err:%s \n", device.ID, err4.Error())
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
//关闭帧
|
//关闭帧
|
||||||
err4 := frame.Close()
|
err4 := frame.Close()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue