third-party-mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-06-06 10:23:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: make parameters consistent

Browse Source
This commit is contained in:
Deluan 2020-02-24 19:04:54 -05:00
parent f4014c475d
commit e032bfcf6b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engine/media_streamer.go
View File

@ -38,7 +38,7 @@ func (ms *mediaStreamer) NewStream(ctx context.Context, id string, maxBitRate in
return nil, err return nil, err
} }
format, bitRate := selectTranscodingOptions(mf, maxBitRate, reqFormat) bitRate, format := selectTranscodingOptions(mf, maxBitRate, reqFormat)
s := &Stream{ctx: ctx, mf: mf, format: format, bitRate: bitRate} s := &Stream{ctx: ctx, mf: mf, format: format, bitRate: bitRate}
if format == "raw" { if format == "raw" {
@ -133,11 +133,11 @@ func (s *Stream) ContentType() string { return mime.TypeByExtension("." + s.form
func (s *Stream) Name() string { return s.mf.Path } func (s *Stream) Name() string { return s.mf.Path }
func (s *Stream) ModTime() time.Time { return s.mf.UpdatedAt } func (s *Stream) ModTime() time.Time { return s.mf.UpdatedAt }
func selectTranscodingOptions(mf *model.MediaFile, maxBitRate int, format string) (string, int) { func selectTranscodingOptions(mf *model.MediaFile, maxBitRate int, format string) (int, string) {
var bitRate int var bitRate int
if format == "raw" || !conf.Server.EnableDownsampling { if format == "raw" || !conf.Server.EnableDownsampling {
return "raw", bitRate return bitRate, "raw"
} else { } else {
if maxBitRate == 0 { if maxBitRate == 0 {
bitRate = mf.BitRate bitRate = mf.BitRate
@ -151,9 +151,9 @@ func selectTranscodingOptions(mf *model.MediaFile, maxBitRate int, format string
} }
if bitRate == mf.BitRate { if bitRate == mf.BitRate {
return "raw", bitRate return bitRate, "raw"
} }
return format, bitRate return bitRate, format
} }
func cacheKey(id string, bitRate int, format string) string { func cacheKey(id string, bitRate int, format string) string {