From 7c633d177d37dbe54648c194ea2632a59eb92911 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 24 九月 2019 13:50:18 +0800
Subject: [PATCH] update ffmpeg decode and audio rec
---
goffmpeg.go | 54 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/goffmpeg.go b/goffmpeg.go
index bf2df6c..1f68e1c 100644
--- a/goffmpeg.go
+++ b/goffmpeg.go
@@ -107,25 +107,6 @@
C.wrap_fn_run(h.ffmpeg, in)
}
-// DecodeJPEG decode jpeg file
-func 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(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,13 +115,17 @@
}
// BuildRecorder build recorder
-func (h *GoFFMPEG) BuildRecorder(sid, output string, mind, maxd, audio 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), C.int(audio))
+ 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
@@ -207,6 +192,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