From 0ead91b8788b382d0d1e7f6eda3f1d008ce39602 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 26 十二月 2023 10:34:01 +0800
Subject: [PATCH] add bgr and yuv420 to jpeg support
---
capture.go | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/capture.go b/capture.go
index a0bcf09..3164d11 100644
--- a/capture.go
+++ b/capture.go
@@ -38,8 +38,8 @@
InvalidFileExt PicExt = PicExt("")
)
-// Capture pic
-func CaptureGB28181(soFile string, url string, maxTry int) ([]byte, error) {
+// capture pic
+func captureGB28181(soFile string, url string, maxTry int) ([]byte, error) {
var ret []byte
var err error
@@ -49,14 +49,14 @@
return nil, err
}
- reterr := errors.New(fmt.Sprintf("try %d times to capture image, is url correct?", maxTry))
- for i := 0; i < maxTry; i++ {
- ret = goffmpeg.GetGBJpg(url)
- if len(ret) > 0 {
- reterr = nil
- break
- }
+ reterr := fmt.Errorf("gb28181 try %d times to capture image, is url correct?", maxTry)
+ // for i := 0; i < maxTry; i++ {
+ ret = goffmpeg.GetGBJpg(url, maxTry)
+ if len(ret) > 0 {
+ reterr = nil
+ // break
}
+ // }
goffmpeg.FreeFFmpeg()
@@ -67,6 +67,10 @@
func Capture(soFile string, m StreamMode, url string, ext PicExt, w, h, maxTry int) ([]byte, error) {
if m != GB28181 && m != Rtsp {
return nil, errors.New("there is no this mode, try capture.Rtsp/capture.GB28181")
+ }
+
+ if m == GB28181 {
+ return captureGB28181(soFile, url, maxTry)
}
if ext == InvalidFileExt {
@@ -102,10 +106,7 @@
tryTime := 0
// 淇濊瘉鏈変竴涓叧閿抚
- maxTry += 50
- if maxTry > 60 {
- maxTry = 60
- }
+ maxTry = maxTry * 1000
var bgrData, jpgData []byte
var err error
@@ -114,8 +115,12 @@
data, ow, oh, _ := gf.GetYUV()
if ow > 0 && oh > 0 {
-
- bgrData = yuv2bgr(data, ow, oh)
+ if ow*oh*3 != len(data) {
+ // data 涓嶆槸 bgr 鏍煎紡锛岄渶瑕佽浆鎹�
+ bgrData = yuv2bgr(data, ow, oh)
+ } else {
+ bgrData = data
+ }
if w > 0 && h > 0 {
bgrData = bgresize(bgrData, ow, oh, w, h)
ow, oh = w, h
@@ -127,11 +132,11 @@
}
break
} else {
- tryTime++
+ tryTime += 40
if tryTime > maxTry {
break
}
- time.Sleep(800 * time.Millisecond)
+ time.Sleep(40 * time.Millisecond)
}
}
--
Gitblit v1.8.0