From f6172eaa5f78d2af04e8e99fdf26b2b0ad4994d6 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 01 八月 2019 15:51:19 +0800
Subject: [PATCH] bug fix record file thread quit dup pkt
---
goffmpeg.go | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 156 insertions(+), 11 deletions(-)
diff --git a/goffmpeg.go b/goffmpeg.go
index e33de3c..d79d0ba 100644
--- a/goffmpeg.go
+++ b/goffmpeg.go
@@ -59,24 +59,36 @@
}
}
+// Config config
+type Config struct {
+ Scale int
+ Width int
+ Height int
+ GB bool
+ CPU bool
+}
+
// GoFFMPEG handle for c
type GoFFMPEG struct {
ffmpeg C.cffmpeg
}
-// New create handle
-func New() *GoFFMPEG {
- return &GoFFMPEG{
- ffmpeg: C.wrap_fn_create(),
- }
-}
-
-// NewWithScale scale out pic
-func NewWithScale(w, h int, flag int) *GoFFMPEG {
+// New 2nd new
+func New(conf Config) *GoFFMPEG {
f := C.wrap_fn_create()
- if f != nil {
- C.wrap_fn_scale(f, C.int(w), C.int(h), C.int(flag))
+ if f == nil {
+ return nil
}
+ if conf.Scale != 0 && conf.Width != 0 && conf.Height != 0 {
+ C.wrap_fn_scale(f, C.int(conf.Width), C.int(conf.Height), C.int(conf.Scale))
+ }
+ if conf.GB {
+ C.wrap_fn_run_gb28181(f)
+ }
+ if conf.CPU {
+ C.wrap_fn_use_cpu(f)
+ }
+
return &GoFFMPEG{
ffmpeg: f,
}
@@ -113,3 +125,136 @@
}
return nil, 0, 0
}
+
+// FireRecorder fire recorder
+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(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, csid, out, C.int(mind), C.int(maxd))
+}
+
+// GetInfoRecorder info
+func (h *GoFFMPEG) GetInfoRecorder() (int, string) {
+ var i C.int = -1
+ var l C.int
+
+ p := C.wrap_fn_info_recorder(h.ffmpeg, &i, &l)
+ // if p == nil {
+ // return -1, ""
+ // }
+ path := C.GoString(p)
+ C.free(unsafe.Pointer(p))
+
+ // fmt.Println("Go get info : ", path, " len: ", l)
+
+ return int(i), path
+}
+
+// GetRecID get rec id
+func (h *GoFFMPEG) GetRecID(p string) string {
+ pt := C.CString(p)
+ defer C.free(unsafe.Pointer(pt))
+ var i C.int
+
+ cid := C.wrap_fn_rec_id(h.ffmpeg, pt, &i)
+
+ id := C.GoString(cid)
+ C.free(unsafe.Pointer(cid))
+
+ return id
+}
+
+// BuildDecoder build decoder
+func (h *GoFFMPEG) BuildDecoder() {
+ C.wrap_fn_decoder(h.ffmpeg)
+}
+
+// GetPicDecoder get pic from decoder
+func (h *GoFFMPEG) GetPicDecoder() ([]byte, int, int, int64) {
+ var width C.int
+ var height C.int
+ var fid C.long
+
+ p := C.wrap_fn_decoder_pic(h.ffmpeg, &width, &height, &fid)
+ if width == 0 && height == 0 {
+ return nil, 0, 0, 0
+ }
+ defer C.free(unsafe.Pointer(p))
+ d := C.GoBytes(p, width*height*3)
+ wid := int(width)
+ hei := int(height)
+ gfid := int64(fid)
+ return d, wid, hei, gfid
+}
+
+//GetAVPacket get AVPacket
+func (h *GoFFMPEG) GetAVPacket() ([]byte, int, int) {
+ var key C.int
+ var size C.int
+
+ p := C.wrap_fn_get_avpacket(h.ffmpeg, &size, &key)
+ if size <= 0 {
+ return nil, 0, -1
+ }
+ defer C.free(unsafe.Pointer(p))
+ d := C.GoBytes(p, size)
+ s := int(size)
+ k := int(key)
+
+ return d, s, k
+}
+
+///////////////for encoder
+
+// GoEncoder encoder
+type GoEncoder struct {
+ enc C.cencoder
+}
+
+// NewEncoder encoder
+func NewEncoder(w, h, fps, br, sFlag, gi int) *GoEncoder {
+ if w <= 0 || h <= 0 {
+ return nil
+ }
+
+ return &GoEncoder{
+ enc: C.wrap_fn_create_encoder(C.int(w), C.int(h), C.int(fps), C.int(br), C.int(sFlag), C.int(gi)),
+ }
+}
+
+// Free free
+func (e *GoEncoder) Free() {
+ C.wrap_fn_destroy_encoder(e.enc)
+}
+
+// Encode pic
+func (e *GoEncoder) Encode(in []byte, w, h int) ([]byte, int, bool) {
+
+ var size C.int
+ var key C.int
+ cin := C.CBytes(in)
+ defer C.free(cin)
+
+ p := C.wrap_fn_encode(e.enc, cin, C.int(w), C.int(h), &size, &key)
+ defer C.free(p)
+ if p != nil && size > 0 {
+ b := C.GoBytes(p, size)
+
+ isKey := false
+ if key > 0 {
+ isKey = true
+ }
+ return b, int(size), isKey
+ }
+ return nil, 0, false
+}
--
Gitblit v1.8.0