From 7950b86a4bf821e126d5e5659b772ce32faa1445 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 25 五月 2021 11:32:24 +0800
Subject: [PATCH] bug fixed declaration
---
goffmpeg.go | 85 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 76 insertions(+), 9 deletions(-)
diff --git a/goffmpeg.go b/goffmpeg.go
index 1844a22..485e568 100644
--- a/goffmpeg.go
+++ b/goffmpeg.go
@@ -92,6 +92,65 @@
}
}
+// NewWithDevID 2nd new
+func NewWithDevID(GB, CPU bool, devID int) *GoFFMPEG {
+
+ f := C.wrap_fn_create(unsafe.Pointer(libcffmpeg))
+
+ if f == nil {
+ return nil
+ }
+ if GB {
+ C.wrap_fn_run_gb28181(unsafe.Pointer(libcffmpeg), f)
+ }
+ if CPU {
+ C.wrap_fn_use_cpu(unsafe.Pointer(libcffmpeg), f)
+ } else if devID > -1 {
+ r := C.wrap_fn_set_devid(unsafe.Pointer(libcffmpeg), f, C.int(devID))
+ if r != 0 {
+ if f != nil {
+ C.wrap_fn_destroy(unsafe.Pointer(libcffmpeg), f)
+ }
+ FreeFFmpeg()
+ return nil
+ }
+ }
+
+ return &GoFFMPEG{
+ ffmpeg: f,
+ }
+}
+
+// NewWithLogAndDevID log
+func NewWithLogAndDevID(GB, CPU bool, devID int, ffmpegLog string) *GoFFMPEG {
+ lf := C.CString(ffmpegLog)
+ defer C.free(unsafe.Pointer(lf))
+
+ f := C.wrap_fn_create2(unsafe.Pointer(libcffmpeg), lf)
+ if f == nil {
+ return nil
+ }
+ if GB {
+ C.wrap_fn_run_gb28181(unsafe.Pointer(libcffmpeg), f)
+ }
+ if CPU {
+ C.wrap_fn_use_cpu(unsafe.Pointer(libcffmpeg), f)
+ } else if devID > -1 {
+ r := C.wrap_fn_set_devid(unsafe.Pointer(libcffmpeg), f, C.int(devID))
+ if r != 0 {
+ if f != nil {
+ C.wrap_fn_destroy(unsafe.Pointer(libcffmpeg), f)
+ }
+ FreeFFmpeg()
+ return nil
+ }
+ }
+
+ return &GoFFMPEG{
+ ffmpeg: f,
+ }
+}
+
// NewWithLog log
func NewWithLog(GB, CPU bool, ffmpegLog string) *GoFFMPEG {
lf := C.CString(ffmpegLog)
@@ -128,6 +187,14 @@
C.wrap_fn_run(unsafe.Pointer(libcffmpeg), h.ffmpeg, in)
}
+// Run2 ffmpeg
+func (h *GoFFMPEG) Run2(input string, minDuration int) {
+ in := C.CString(input)
+ defer C.free(unsafe.Pointer(in))
+
+ C.wrap_fn_run(unsafe.Pointer(libcffmpeg), h.ffmpeg, in)
+}
+
// FPS fps
func (h *GoFFMPEG) FPS() int {
return int(C.wrap_fn_fps(unsafe.Pointer(libcffmpeg), h.ffmpeg))
@@ -142,14 +209,14 @@
}
// GetGBJpg Get GB28181 Jpg
-func GetGBJpg(rtspUrl string) []byte {
- rtsp := C.CString(rtspUrl)
- defer C.free(unsafe.Pointer(rtsp))
- var jpgLen C.int
+func GetGBJpg(rtspURL string, maxTry int) []byte {
+ rtsp := C.CString(rtspURL)
+ defer C.free(unsafe.Pointer(rtsp))
+ var jpgLen C.int
- pic := C.wrap_fn_get_gb28181_pic(unsafe.Pointer(libcffmpeg), rtsp, &jpgLen)
- defer C.free(unsafe.Pointer(pic))
+ pic := C.wrap_fn_get_gb28181_pic(unsafe.Pointer(libcffmpeg), rtsp, &jpgLen, C.int(maxTry))
+ defer C.free(unsafe.Pointer(pic))
- retJpg := C.GoBytes(unsafe.Pointer(pic), jpgLen)
- return retJpg
-}
\ No newline at end of file
+ retJpg := C.GoBytes(unsafe.Pointer(pic), jpgLen)
+ return retJpg
+}
--
Gitblit v1.8.0