From 602b3b2a792d65e49dba07920b100b5feb39d36f Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 16 九月 2019 13:43:40 +0800
Subject: [PATCH] remove log
---
goffmpeg.go | 43 +++++++++++++++++++------------------------
1 files changed, 19 insertions(+), 24 deletions(-)
diff --git a/goffmpeg.go b/goffmpeg.go
index 8569084..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,33 +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
-}
-
-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 +173,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
--
Gitblit v1.8.0