mirrors
/
gotosocial
mirror of
1
Fork 0
Code Issues Releases Activity

[bugfix] support classifying correct video codec without audio as webm (#3494) 

* for webm support video:[vp8,vp9,av1] and audio:[NONE,vorbis,opus]

* improved unsupported data type error output
This commit is contained in:
kim 2024-10-28 13:09:21 +00:00 committed by GitHub
parent e86592bc32
commit 7ec6509e11
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
internal/media/ffmpeg.go
View File

@ -392,18 +392,31 @@ func (res *result) GetFileType() (gtsmodel.FileType, string) {
case "matroska,webm": case "matroska,webm":
switch { switch {
case len(res.video) > 0: case len(res.video) > 0:
var isWebm bool
switch res.video[0].codec { switch res.video[0].codec {
case "vp8", "vp9", "av1": case "vp8", "vp9", "av1":
default: if len(res.audio) > 0 {
return gtsmodel.FileTypeVideo, "mkv" switch res.audio[0].codec {
} case "vorbis", "opus", "libopus":
if len(res.audio) > 0 { // webm only supports [VP8/VP9/AV1] +
switch res.audio[0].codec { // [vorbis/opus]
case "vorbis", "opus", "libopus": isWebm = true
// webm only supports [VP8/VP9/AV1]+[vorbis/opus] }
return gtsmodel.FileTypeVideo, "webm" } else {
// no audio with correct
// video codec also fine.
isWebm = true
} }
} }
if isWebm {
// Check for valid webm codec config.
return gtsmodel.FileTypeVideo, "webm"
}
// All else falls under generic mkv.
return gtsmodel.FileTypeVideo, "mkv"
case len(res.audio) > 0: case len(res.audio) > 0:
return gtsmodel.FileTypeAudio, "mka" return gtsmodel.FileTypeAudio, "mka"
} }

2
internal/media/processingemoji.go
View File

@ -158,7 +158,7 @@ func (p *ProcessingEmoji) store(ctx context.Context) error {
if err != nil && !isUnsupportedTypeErr(err) { if err != nil && !isUnsupportedTypeErr(err) {
return gtserror.Newf("ffprobe error: %w", err) return gtserror.Newf("ffprobe error: %w", err)
} else if result == nil { } else if result == nil {
log.Warn(ctx, "unsupported data type") log.Warnf(ctx, "unsupported data type by ffprobe: %v", err)
return nil return nil
} }

8
internal/media/processingmedia.go
View File

@ -22,6 +22,7 @@ import (
"os" "os"
errorsv2 "codeberg.org/gruf/go-errors/v2" errorsv2 "codeberg.org/gruf/go-errors/v2"
"codeberg.org/gruf/go-kv"
"codeberg.org/gruf/go-runners" "codeberg.org/gruf/go-runners"
"github.com/superseriousbusiness/gotosocial/internal/gtserror" "github.com/superseriousbusiness/gotosocial/internal/gtserror"
@ -166,7 +167,7 @@ func (p *ProcessingMedia) store(ctx context.Context) error {
if err != nil && !isUnsupportedTypeErr(err) { if err != nil && !isUnsupportedTypeErr(err) {
return gtserror.Newf("ffprobe error: %w", err) return gtserror.Newf("ffprobe error: %w", err)
} else if result == nil { } else if result == nil {
log.Warn(ctx, "unsupported data type") log.Warnf(ctx, "unsupported data type by ffprobe: %v", err)
return nil return nil
} }
@ -214,7 +215,10 @@ func (p *ProcessingMedia) store(ctx context.Context) error {
// metadata, in order to keep tags. // metadata, in order to keep tags.
default: default:
log.Warn(ctx, "unsupported data type: %s", result.format) log.WarnKVs(ctx, kv.Fields{
{K: "format", V: result.format},
{K: "msg", V: "unsupported data type"},
}...)
return nil return nil
} }