Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-17 12:24:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix custom transcode arguments (#3491)

Browse Source
This commit is contained in:
DingDongSoLong4
2023-02-27 23:15:52 +02:00
committed by GitHub
parent 967a25f64a
commit 445e0a7311
4 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/ffmpeg/stream_transcode.go
View File

@@ -89,23 +89,34 @@ type TranscodeOptions struct {
StartTime float64
}
func (o TranscodeOptions) makeStreamArgs(vf *file.VideoFile, maxScale int, startTime float64) Args {
func (o TranscodeOptions) makeStreamArgs(sm *StreamManager) Args {
maxTranscodeSize := sm.config.GetMaxStreamingTranscodeSize().GetMaxResolution()
if o.Resolution != "" {
maxTranscodeSize = models.StreamingResolutionEnum(o.Resolution).GetMaxResolution()
}
extraInputArgs := sm.config.GetLiveTranscodeInputArgs()
extraOutputArgs := sm.config.GetLiveTranscodeOutputArgs()
args := Args{"-hide_banner"}
args = args.LogLevel(LogLevelError)
if startTime != 0 {
args = args.Seek(startTime)
args = append(args, extraInputArgs...)
if o.StartTime != 0 {
args = args.Seek(o.StartTime)
}
args = args.Input(vf.Path)
args = args.Input(o.VideoFile.Path)
videoOnly := ProbeAudioCodec(vf.AudioCodec) == MissingUnsupported
videoOnly := ProbeAudioCodec(o.VideoFile.AudioCodec) == MissingUnsupported
var videoFilter VideoFilter
videoFilter = videoFilter.ScaleMax(vf.Width, vf.Height, maxScale)
videoFilter = videoFilter.ScaleMax(o.VideoFile.Width, o.VideoFile.Height, maxTranscodeSize)
args = append(args, o.StreamType.Args(videoFilter, videoOnly)...)
args = append(args, extraOutputArgs...)
args = args.Output("pipe:")
return args
@@ -134,12 +145,7 @@ func (sm *StreamManager) ServeTranscode(w http.ResponseWriter, r *http.Request,
}
func (sm *StreamManager) getTranscodeStream(ctx *fsutil.LockContext, options TranscodeOptions) (http.HandlerFunc, error) {
maxTranscodeSize := sm.config.GetMaxStreamingTranscodeSize().GetMaxResolution()
if options.Resolution != "" {
maxTranscodeSize = models.StreamingResolutionEnum(options.Resolution).GetMaxResolution()
}
args := options.makeStreamArgs(options.VideoFile, maxTranscodeSize, options.StartTime)
args := options.makeStreamArgs(sm)
cmd := sm.encoder.Command(ctx, args)
stdout, err := cmd.StdoutPipe()