From bfded635a544a1ab5d252739f4be4f7f30b39b7f Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 26 七月 2019 14:46:48 +0800
Subject: [PATCH] update ffmpeg
---
apipassive.go | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/apipassive.go b/apipassive.go
index 84dfda5..5ea32ea 100644
--- a/apipassive.go
+++ b/apipassive.go
@@ -5,19 +5,25 @@
#include "libcffmpeg.h"
*/
import "C"
-import "unsafe"
+import (
+ "unsafe"
+)
// FireRecorder fire recorder
-func (h *GoFFMPEG) FireRecorder(id int64) {
- C.wrap_fn_fire_recorder(h.ffmpeg, C.long(id))
+func (h *GoFFMPEG) FireRecorder(sid string, id int64) {
+ csid := C.CString(sid)
+ defer C.free(unsafe.Pointer(csid))
+ C.wrap_fn_fire_recorder(h.ffmpeg, csid, C.long(id))
}
// BuildRecorder build recorder
-func (h *GoFFMPEG) BuildRecorder(output string, mind, maxd int) {
+func (h *GoFFMPEG) BuildRecorder(sid, output string, mind, maxd int) {
out := C.CString(output)
defer C.free(unsafe.Pointer(out))
+ csid := C.CString(sid)
+ defer C.free(unsafe.Pointer(csid))
- C.wrap_fn_recorder(h.ffmpeg, out, C.int(mind), C.int(maxd))
+ C.wrap_fn_recorder(h.ffmpeg, csid, out, C.int(mind), C.int(maxd))
}
// GetInfoRecorder info
@@ -26,12 +32,15 @@
var l C.int
p := C.wrap_fn_info_recorder(h.ffmpeg, &i, &l)
- if i == -1 {
- return -1, ""
- }
- defer C.free(unsafe.Pointer(p))
+ // if p == nil {
+ // return -1, ""
+ // }
+ path := C.GoString(p)
+ C.free(unsafe.Pointer(p))
- return int(i), C.GoString(p)
+ // fmt.Println("Go get info : ", path, " len: ", l)
+
+ return int(i), path
}
// BuildDecoder build decoder
@@ -71,4 +80,4 @@
k := int(key)
return d, s, k
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0