From d9952f61a53b693a75490e4932d7136e14e7dc08 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 01 九月 2020 15:22:05 +0800
Subject: [PATCH] bug fixed
---
goffmpeg.go | 63 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 2 deletions(-)
diff --git a/goffmpeg.go b/goffmpeg.go
index bca75d2..52a3a7d 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)
@@ -150,8 +209,8 @@
}
// GetGBJpg Get GB28181 Jpg
-func GetGBJpg(rtspUrl string) []byte {
- rtsp := C.CString(rtspUrl)
+func GetGBJpg(rtspURL string) []byte {
+ rtsp := C.CString(rtspURL)
defer C.free(unsafe.Pointer(rtsp))
var jpgLen C.int
--
Gitblit v1.8.0