From e878e92811a2dbfb6b4d3f7b2c357435f56e28db Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期日, 29 九月 2019 10:27:21 +0800
Subject: [PATCH] add trytime
---
goffmpeg.go | 127 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 123 insertions(+), 4 deletions(-)
diff --git a/goffmpeg.go b/goffmpeg.go
index b8739f8..d23bf80 100644
--- a/goffmpeg.go
+++ b/goffmpeg.go
@@ -75,7 +75,33 @@
// New 2nd new
func New(conf Config) *GoFFMPEG {
+
f := C.wrap_fn_create()
+
+ 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,
+ }
+}
+
+// NewWithLog log
+func NewWithLog(conf Config, logfile string) *GoFFMPEG {
+ lf := C.CString(logfile)
+ defer C.free(unsafe.Pointer(lf))
+
+ f := C.wrap_fn_create2(lf)
if f == nil {
return nil
}
@@ -107,14 +133,107 @@
C.wrap_fn_run(h.ffmpeg, in)
}
-// DecodeJPEG decode jpeg file
-func (h *GoFFMPEG) DecodeJPEG(input string) ([]byte, int, int) {
+// 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, audio bool) {
+ out := C.CString(output)
+ defer C.free(unsafe.Pointer(out))
+ csid := C.CString(sid)
+ defer C.free(unsafe.Pointer(csid))
+
+ a := 0
+ if audio {
+ a = 1
+ }
+ C.wrap_fn_recorder(h.ffmpeg, csid, out, C.int(mind), C.int(maxd), C.int(a))
+}
+
+// GetInfoRecorder info
+func (h *GoFFMPEG) GetInfoRecorder() (string, int, string) {
+ var i C.int = -1
+
+ var id *C.char
+ var idl C.int
+
+ var p *C.char
+ var pl C.int
+
+ C.wrap_fn_info_recorder(h.ffmpeg, &i, &id, &idl, &p, &pl)
+ // if p == nil {
+ // return -1, ""
+ // }
+ gID := C.GoString(id)
+ C.free(unsafe.Pointer(id))
+ path := C.GoString(p)
+ C.free(unsafe.Pointer(p))
+
+ // fmt.Println("Go get info : ", path, " len: ", l)
+
+ return gID, int(i), path
+}
+
+// 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 decoder
+
+// Decode decode jpeg file
+// return val: -1 open error; -2, find stream error; -3, converter create error
+func Decode(input string, gb bool) ([]byte, int, int) {
in := C.CString(input)
defer C.free(unsafe.Pointer(in))
+ withGB := 0
+ if gb {
+ withGB = 1
+ }
+
var width C.int
var height C.int
- p := C.wrap_fn_decode_jpeg(h.ffmpeg, in, &width, &height)
+ p := C.wrap_fn_decode(in, C.int(withGB), &width, &height)
defer C.free(p)
if width > 0 && height > 0 {
@@ -123,7 +242,7 @@
hei := int(height)
return data, wid, hei
}
- return nil, 0, 0
+ return nil, int(width), int(height)
}
///////////////for encoder
--
Gitblit v1.8.0