From 513d2e24abff6de1b35b2471a57ce1361686e6de Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期六, 29 六月 2019 16:21:15 +0800
Subject: [PATCH] 修改解码gb28181的bug
---
goffmpeg.go | 71 ++++++++++++++++++++++++++++++-----
1 files changed, 60 insertions(+), 11 deletions(-)
diff --git a/goffmpeg.go b/goffmpeg.go
index b497fac..0a2e4ee 100644
--- a/goffmpeg.go
+++ b/goffmpeg.go
@@ -7,35 +7,84 @@
*/
import "C"
import (
+ "errors"
"fmt"
"unsafe"
)
-// GoFFMPEG handle for c
-type GoFFMPEG struct {
- lib C.libcffmpeg
- ffmpeg C.cffmpeg
-}
+const (
+ // ScaleFastBilinear SWS_FAST_BILINEAR
+ ScaleFastBilinear = 1
+ // ScaleBilinear SWS_BILINEAR
+ ScaleBilinear = 2
+ // ScaleBicubic SWS_BICUBIC
+ ScaleBicubic = 4
+ // ScaleX SWS_X
+ ScaleX = 8
+ // ScalePoint SWS_POINT
+ ScalePoint = 0x10
+ // ScaleArea SWS_AREA
+ ScaleArea = 0x20
+ // ScaleBicublin SWS_BICUBLIN
+ ScaleBicublin = 0x40
+ // ScaleGauss SWS_GAUSS
+ ScaleGauss = 0x80
+ // ScaleSinc SWS_SINC
+ ScaleSinc = 0x100
+ // ScaleLancZos SWS_LANCZOS
+ ScaleLancZos = 0x200
+ // ScaleSpline SWS_SPLINE
+ ScaleSpline = 0x400
+)
-// New create handle
-func New() *GoFFMPEG {
+var libcffmpeg C.libcffmpeg
+
+// InitFFmpeg init ffmepg
+func InitFFmpeg() error {
soFile := C.CString("./runtime/libcffmpeg.so")
defer C.free(unsafe.Pointer(soFile))
lib := C.init_libcffmpeg(soFile)
if lib == nil {
fmt.Println("open libcffmpeg.so error")
- return nil
+ return errors.New("init ffmpeg error")
+ }
+ libcffmpeg = lib
+ return nil
+}
+
+// FreeFFmpeg free ffmpeg
+func FreeFFmpeg() {
+ if libcffmpeg != nil {
+ C.release_libcffmpeg(libcffmpeg)
+ }
+}
+
+// GoFFMPEG handle for c
+type GoFFMPEG struct {
+ ffmpeg C.cffmpeg
+}
+
+// New create handle
+func New() *GoFFMPEG {
+ return &GoFFMPEG{
+ ffmpeg: C.wrap_fn_create(),
+ }
+}
+
+// NewWithScale scale out pic
+func NewWithScale(w, h int, flag int) *GoFFMPEG {
+ f := C.wrap_fn_create()
+ if f != nil {
+ C.wrap_fn_scale(f, C.int(w), C.int(h), C.int(flag))
}
return &GoFFMPEG{
- lib: lib,
- ffmpeg: C.wrap_fn_create(),
+ ffmpeg: f,
}
}
// Free free handle
func (h *GoFFMPEG) Free() {
C.wrap_fn_destroy(h.ffmpeg)
- C.release_libcffmpeg(h.lib)
}
// Run ffmpeg
--
Gitblit v1.8.0