From 35395f32869d0721fd8e1b614ac8cf179ebe4b98 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 06 二月 2023 14:53:17 +0800
Subject: [PATCH] consistent with c api
---
shmparser/shmparser.go | 5 +----
main.go | 9 +++++++--
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/main.go b/main.go
index c3572b3..6aba6bf 100644
--- a/main.go
+++ b/main.go
@@ -5,6 +5,7 @@
"goshm/shmparser"
"io/ioutil"
"os"
+ "strings"
"time"
)
@@ -51,9 +52,10 @@
if i < 2 {
w, h = 720, 576
}
+ timestamp := strings.Replace(time.Now().Format("2006-01-02 15:04:05.000"), ".", ":", -1)
d := readFile(f)
- shmparser.Image2Shm(shm, "cameraid", "cameraname", d, w, h, 1122331122)
+ shmparser.Image2Shm(shm, "cameraid", "cameraname", timestamp, d, w, h, 1122331122)
printImage(shm, fmt.Sprintf("./npic/%dx%d.%d", w, h, i))
}
} else {
@@ -62,8 +64,11 @@
if i < 2 {
w, h = 720, 576
}
+
+ timestamp := strings.Replace(time.Now().Format("2006-01-02 15:04:05.000"), ".", ":", -1)
+
d := readFile(files[i])
- shmparser.Image2Shm(shm, "cameraid", "cameraname", d, w, h, 1122331122)
+ shmparser.Image2Shm(shm, "cameraid", "cameraname", timestamp, d, w, h, 1122331122)
printImage(shm, fmt.Sprintf("./npic/%dx%d.%d", w, h, i))
}
}
diff --git a/shmparser/shmparser.go b/shmparser/shmparser.go
index d814eed..1c57973 100644
--- a/shmparser/shmparser.go
+++ b/shmparser/shmparser.go
@@ -7,8 +7,6 @@
*/
import "C"
import (
- "strings"
- "time"
"unsafe"
)
@@ -23,8 +21,7 @@
}
// Image2Shm fill image to shm
-func Image2Shm(shm []byte, cid, cname string, data []byte, w, h int, fid int64) {
- timestamp := strings.Replace(time.Now().Format("2006-01-02 15:04:05.000"), ".", ":", -1)
+func Image2Shm(shm []byte, cid, cname, timestamp string, data []byte, w, h int, fid int64) {
dataptr := (*C.uchar)(unsafe.Pointer(&data[0]))
cidbyte := str2byte(cid)
--
Gitblit v1.8.0