From 48c8a8ce082ebdb992cb52cdd766298e8ca19011 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 25 五月 2021 11:04:56 +0800
Subject: [PATCH] bug fixed gb28181 capture picture
---
godec.go | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/godec.go b/godec.go
index a232618..50f5ea2 100644
--- a/godec.go
+++ b/godec.go
@@ -9,7 +9,7 @@
// BuildDecoder build decoder
func (h *GoFFMPEG) BuildDecoder() {
- C.wrap_fn_decoder(h.ffmpeg)
+ C.wrap_fn_decoder(unsafe.Pointer(libcffmpeg), h.ffmpeg)
}
// GetYUV get yuv data
@@ -18,11 +18,48 @@
var length C.int
var srcW, srcH, srcF C.int
- p := C.wrap_fn_decoder_pic(h.ffmpeg, &srcW, &srcH, &srcF, &length, &fid)
- if srcW == 0 || srcH == 0 {
+ var yuv *C.uchar
+ r := C.wrap_fn_decoder_pic(unsafe.Pointer(libcffmpeg), h.ffmpeg, &yuv, &srcW, &srcH, &srcF, &length, &fid)
+
+ if r < 0 {
+ return nil, int(r), int(r), int64(r)
+ }
+
+ if yuv == nil || length == 0 || srcW == 0 || srcH == 0 {
return nil, 0, 0, 0
}
- defer C.free(unsafe.Pointer(p))
- return C.GoBytes(p, length), int(srcW), int(srcH), int64(fid)
+ defer C.free(unsafe.Pointer(yuv))
+
+ return C.GoBytes(unsafe.Pointer(yuv), length), int(srcW), int(srcH), int64(fid)
+}
+
+// GetYUV2 get yuv data
+func (h *GoFFMPEG) GetYUV2() (unsafe.Pointer, []byte, int, int, int64) {
+ var fid C.long
+ var length C.int
+ var srcW, srcH, srcF C.int
+
+ var yuv *C.uchar
+ r := C.wrap_fn_decoder_pic(unsafe.Pointer(libcffmpeg), h.ffmpeg, &yuv, &srcW, &srcH, &srcF, &length, &fid)
+
+ if r < 0 {
+ return nil, nil, int(r), int(r), int64(r)
+ }
+
+ if yuv == nil || length == 0 || srcW == 0 || srcH == 0 {
+ return nil, nil, 0, 0, 0
+ }
+
+ const maxLen = 0x7fffffff
+ size := int(length)
+ data := (*[maxLen]byte)(unsafe.Pointer(yuv))[:size:size]
+
+ return unsafe.Pointer(yuv), data, int(srcW), int(srcH), int64(fid)
+}
+
+// SetDecMinDuration min duration
+// 涓昏鏄鏋滆В鐮佹枃浠舵椂闀垮お鐭紝鍙兘鍦╯dk鏀跺埌瑙ｇ爜鏁版嵁鍓嶈В鐮佽繘绋嬭繍琛岀粨鏉燂紝鎵�浠ヨ瀹氫竴涓渶鐭殑duration
+func (h *GoFFMPEG) SetDecMinDuration(min, max int) {
+ C.wrap_fn_rec_duration(unsafe.Pointer(libcffmpeg), h.ffmpeg, C.int(min), C.int(max))
}
--
Gitblit v1.8.0