From c5a01eed95f1837e93fee27bce4da78c79f4ed10 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 12 十一月 2019 17:41:43 +0800
Subject: [PATCH] update
---
goffmpeg.go | 72 +++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 25 deletions(-)
diff --git a/goffmpeg.go b/goffmpeg.go
index d7676d2..efaf6cc 100644
--- a/goffmpeg.go
+++ b/goffmpeg.go
@@ -15,12 +15,12 @@
var libcffmpeg C.libcffmpeg
// InitFFmpeg init ffmepg
-func InitFFmpeg() error {
- soFile := C.CString("./runtime/libcffmpeg.so")
+func InitFFmpeg(soFileGo string) error {
+ soFile := C.CString(soFileGo)
defer C.free(unsafe.Pointer(soFile))
lib := C.init_libcffmpeg(soFile)
if lib == nil {
- fmt.Println("open libcffmpeg.so error")
+ fmt.Println("open error: ", soFileGo)
return errors.New("init ffmpeg error")
}
libcffmpeg = lib
@@ -39,16 +39,52 @@
ffmpeg C.cffmpeg
}
-// New create handle
-func New() *GoFFMPEG {
+// New 2nd new
+func New(GB, CPU bool) *GoFFMPEG {
+
+ f := C.wrap_fn_create(unsafe.Pointer(libcffmpeg))
+
+ if f == nil {
+ return nil
+ }
+ if GB {
+ C.wrap_fn_run_gb28181(unsafe.Pointer(libcffmpeg), f)
+ }
+ if CPU {
+ C.wrap_fn_use_cpu(unsafe.Pointer(libcffmpeg), f)
+ }
+
return &GoFFMPEG{
- ffmpeg: C.wrap_fn_create(),
+ ffmpeg: f,
+ }
+}
+
+// NewWithLog log
+func NewWithLog(GB, CPU bool, ffmpegLog string) *GoFFMPEG {
+ lf := C.CString(ffmpegLog)
+ defer C.free(unsafe.Pointer(lf))
+
+ f := C.wrap_fn_create2(unsafe.Pointer(libcffmpeg), lf)
+ if f == nil {
+ return nil
+ }
+ if GB {
+ C.wrap_fn_run_gb28181(unsafe.Pointer(libcffmpeg), f)
+ }
+ if CPU {
+ C.wrap_fn_use_cpu(unsafe.Pointer(libcffmpeg), f)
+ }
+
+ return &GoFFMPEG{
+ ffmpeg: f,
}
}
// Free free handle
func (h *GoFFMPEG) Free() {
- C.wrap_fn_destroy(h.ffmpeg)
+ if h.ffmpeg != nil {
+ C.wrap_fn_destroy(unsafe.Pointer(libcffmpeg), h.ffmpeg)
+ }
}
// Run ffmpeg
@@ -56,24 +92,10 @@
in := C.CString(input)
defer C.free(unsafe.Pointer(in))
- C.wrap_fn_run(h.ffmpeg, in)
+ C.wrap_fn_run(unsafe.Pointer(libcffmpeg), 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
+// FPS fps
+func (h *GoFFMPEG) FPS() int {
+ return int(C.wrap_fn_fps(unsafe.Pointer(libcffmpeg), h.ffmpeg))
}
--
Gitblit v1.8.0