lukas/OpenMediaCenter
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases Wiki Activity

remove direct libcall due to lib update

Browse Source
This commit is contained in:
Lukas Heiligenbrunner
2021-09-25 23:52:21 +02:00
parent 9f1d1255cb
commit 9a88c16559
4 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -28,8 +28,6 @@ Build_Backend:
image: golang:latest image: golang:latest
stage: build_backend stage: build_backend
script: script:
- apt update
- apt install libffmpeg-ocaml-dev
- cd apiGo - cd apiGo
- go build -v -tags sharedffmpeg -o openmediacenter - go build -v -tags sharedffmpeg -o openmediacenter
- cp -r ../build/ ./static/ - cp -r ../build/ ./static/

2
apiGo/go.mod
View File

@@ -3,7 +3,7 @@ module openmediacenter/apiGo
go 1.16 go 1.16
require ( require (
github.com/3d0c/gmf v0.0.0-20210830084021-7b27911659a2 // indirect github.com/3d0c/gmf v0.0.0-20210925211039-e278e6e53b16
github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/go-sql-driver/mysql v1.5.0 github.com/go-sql-driver/mysql v1.5.0
github.com/pelletier/go-toml/v2 v2.0.0-beta.3 github.com/pelletier/go-toml/v2 v2.0.0-beta.3

4
apiGo/go.sum
View File

@@ -1,6 +1,6 @@
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
github.com/3d0c/gmf v0.0.0-20210830084021-7b27911659a2 h1:+wdkl7m6ElGhLyYxHab+uPYf57MQ4XpX6EuG/8kbkLg= github.com/3d0c/gmf v0.0.0-20210925211039-e278e6e53b16 h1:LX3XWmS88yKgWJcMXb8vusphpDBe9+6LTI9FyHeFFWQ=
github.com/3d0c/gmf v0.0.0-20210830084021-7b27911659a2/go.mod h1:0QMRcUq2JsDECeAq7bj4h79k7XbhtTsrPUQf6G7qfPs= github.com/3d0c/gmf v0.0.0-20210925211039-e278e6e53b16/go.mod h1:0QMRcUq2JsDECeAq7bj4h79k7XbhtTsrPUQf6G7qfPs=
github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

18
apiGo/videoparser/thumbnail/Thumbnailparser_shared_ffmpeg.go
View File

@@ -2,17 +2,6 @@
package thumbnail package thumbnail
/*
#cgo pkg-config: libavcodec
#include <stdlib.h>
#include "libavcodec/avcodec.h"
#include "libavutil/pixfmt.h"
*/
import "C"
import ( import (
"github.com/3d0c/gmf" "github.com/3d0c/gmf"
"io" "io"
@@ -68,12 +57,7 @@ func decodePic(srcFileName string, decodeExtension string, time uint64) (pic *[]
cc.SetTimeBase(gmf.AVR{Num: 1, Den: 1}) cc.SetTimeBase(gmf.AVR{Num: 1, Den: 1})
// add missing codecs in lib cc.SetPixFmt(gmf.AV_PIX_FMT_YUVJ444P).SetWidth(srcVideoStream.CodecPar().Width()).SetHeight(srcVideoStream.CodecPar().Height())
var (
AV_PIX_FMT_YUVJ444P int32 = C.AV_PIX_FMT_YUVJ444P
)
cc.SetPixFmt(AV_PIX_FMT_YUVJ444P).SetWidth(srcVideoStream.CodecPar().Width()).SetHeight(srcVideoStream.CodecPar().Height())
if codec.IsExperimental() { if codec.IsExperimental() {
cc.SetStrictCompliance(gmf.FF_COMPLIANCE_EXPERIMENTAL) cc.SetStrictCompliance(gmf.FF_COMPLIANCE_EXPERIMENTAL)
} }