From 23c29d81f2c917bbb80fbfbeb285bb45a159331a Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 25 五月 2021 11:05:05 +0800
Subject: [PATCH] bug fixed gb28181 capture picture
---
capture.go | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/capture.go b/capture.go
index a0bcf09..57b725d 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 := errors.New(fmt.Sprintf("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()
@@ -69,6 +69,10 @@
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 {
ext = JPEGFileExt
}
--
Gitblit v1.8.0