From 9b21b25d1e891e2cda1d5b7ef6beb09fc308f6c5 Mon Sep 17 00:00:00 2001
From: cheliequan <liequanche@126.com>
Date: 星期二, 07 二月 2023 17:50:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/valib/c_shm
---
main.go | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/main.go b/main.go
index 73fa91e..4751fa1 100644
--- a/main.go
+++ b/main.go
@@ -5,6 +5,7 @@
"fmt"
"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))
}
}
--
Gitblit v1.8.0