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

Don't try to transcode a file if the requested format is the same and the client is not requesting to downsample

Browse Source
This commit is contained in:
Deluan 2020-04-02 22:17:52 -04:00
parent 2d7998de59
commit 2392060bc1
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/media_streamer.go
View File

@ -147,6 +147,10 @@ func selectTranscodingOptions(ctx context.Context, ds model.DataStore, mf *model
if reqFormat == "raw" { if reqFormat == "raw" {
return return
} }
if reqFormat == mf.Suffix && reqBitRate == 0 {
bitRate = mf.BitRate
return
}
trc, hasDefault := ctx.Value("transcoding").(model.Transcoding) trc, hasDefault := ctx.Value("transcoding").(model.Transcoding)
var cFormat string var cFormat string
var cBitRate int var cBitRate int

7
engine/media_streamer_test.go
View File

@ -104,6 +104,13 @@ var _ = Describe("MediaStreamer", func() {
Expect(format).To(Equal("mp3")) Expect(format).To(Equal("mp3"))
Expect(bitRate).To(Equal(192)) Expect(bitRate).To(Equal(192))
}) })
It("returns raw if requested format is the same as the original, but requested BitRate is 0", func() {
mf.Suffix = "mp3"
mf.BitRate = 320
format, bitRate := selectTranscodingOptions(ctx, ds, mf, "mp3", 0)
Expect(format).To(Equal("raw"))
Expect(bitRate).To(Equal(320))
})
}) })
Context("player has format configured", func() { Context("player has format configured", func() {