From 278634c0d2eeba9e3fcc3b4cd56ddfb3323277d7 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期二, 10 三月 2020 10:08:20 +0800
Subject: [PATCH] compatible to local files
---
godec.go | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/godec.go b/godec.go
index 25baa88..90f3803 100644
--- a/godec.go
+++ b/godec.go
@@ -18,13 +18,20 @@
var length C.int
var srcW, srcH, srcF C.int
- p := C.wrap_fn_decoder_pic(unsafe.Pointer(libcffmpeg), h.ffmpeg, &srcW, &srcH, &srcF, &length, &fid)
- if p == nil || length == 0 || 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(yuv, length), int(srcW), int(srcH), int64(fid)
}
// GetYUV2 get yuv data
@@ -33,13 +40,26 @@
var length C.int
var srcW, srcH, srcF C.int
- p := C.wrap_fn_decoder_pic(unsafe.Pointer(libcffmpeg), h.ffmpeg, &srcW, &srcH, &srcF, &length, &fid)
- if p == nil || length == 0 || srcW == 0 || srcH == 0 {
- return nil, nil, 0, 0, 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
+ }
+
const maxLen = 0x7fffffff
size := int(length)
data := (*[maxLen]byte)(unsafe.Pointer(p))[:size:size]
return unsafe.Pointer(p), 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