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 | 119 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 76 insertions(+), 43 deletions(-)
diff --git a/goffmpeg.go b/goffmpeg.go
index 8569084..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,25 +133,6 @@
C.wrap_fn_run(h.ffmpeg, in)
}
-// DecodeJPEG decode jpeg file
-func (h *GoFFMPEG) DecodeJPEG(input string) ([]byte, int, int) {
- in := C.CString(input)
- defer C.free(unsafe.Pointer(in))
-
- var width C.int
- var height C.int
- p := C.wrap_fn_decode_jpeg(h.ffmpeg, in, &width, &height)
- defer C.free(p)
-
- if width > 0 && height > 0 {
- data := C.GoBytes(p, width*height*3)
- wid := int(width)
- hei := int(height)
- return data, wid, hei
- }
- return nil, 0, 0
-}
-
// FireRecorder fire recorder
func (h *GoFFMPEG) FireRecorder(sid string, id int64) {
csid := C.CString(sid)
@@ -134,43 +141,41 @@
}
// BuildRecorder build recorder
-func (h *GoFFMPEG) BuildRecorder(sid, output string, mind, maxd int) {
+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))
- C.wrap_fn_recorder(h.ffmpeg, csid, out, C.int(mind), C.int(maxd))
+ 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() (int, string) {
+func (h *GoFFMPEG) GetInfoRecorder() (string, int, string) {
var i C.int = -1
- var l C.int
- p := C.wrap_fn_info_recorder(h.ffmpeg, &i, &l)
+ 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 int(i), path
-}
-
-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
+ return gID, int(i), path
}
// BuildDecoder build decoder
@@ -179,20 +184,21 @@
}
// GetPicDecoder get pic from decoder
-func (h *GoFFMPEG) GetPicDecoder() ([]byte, int, int) {
+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)
+ p := C.wrap_fn_decoder_pic(h.ffmpeg, &width, &height, &fid)
if width == 0 && height == 0 {
- return nil, 0, 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)
-
- return d, wid, hei
+ gfid := int64(fid)
+ return d, wid, hei, gfid
}
//GetAVPacket get AVPacket
@@ -212,6 +218,33 @@
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(in, C.int(withGB), &width, &height)
+ defer C.free(p)
+
+ if width > 0 && height > 0 {
+ data := C.GoBytes(p, width*height*3)
+ wid := int(width)
+ hei := int(height)
+ return data, wid, hei
+ }
+ return nil, int(width), int(height)
+}
+
///////////////for encoder
// GoEncoder encoder
--
Gitblit v1.8.0