From 927a49bc04984400cb9b968e41d299cc977e4988 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 16 九月 2019 12:54:33 +0800
Subject: [PATCH] update so file
---
goffmpeg.go | 33 +++++++++++++--------------------
1 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/goffmpeg.go b/goffmpeg.go
index d79d0ba..1efcb8d 100644
--- a/goffmpeg.go
+++ b/goffmpeg.go
@@ -108,13 +108,13 @@
}
// DecodeJPEG decode jpeg file
-func (h *GoFFMPEG) DecodeJPEG(input string) ([]byte, int, int) {
+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(h.ffmpeg, in, &width, &height)
+ p := C.wrap_fn_decode_jpeg(in, &width, &height)
defer C.free(p)
if width > 0 && height > 0 {
@@ -144,34 +144,27 @@
}
// 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
-}
-
-// 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
+ return gID, int(i), path
}
// BuildDecoder build decoder
--
Gitblit v1.8.0