heimoshuiyu/gonic
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

add more logging to transcode rules

Browse Source 
related #445
This commit is contained in:
sentriz
2023-12-29 22:06:12 +00:00
parent 422c684f44
commit 5bcd339501
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/ctrlsubsonic/handlers_raw.go
View File

@@ -188,16 +188,24 @@ func (c *Controller) ServeStream(w http.ResponseWriter, r *http.Request) *spec.R
format, _ := params.Get("format") format, _ := params.Get("format")
timeOffset, _ := params.GetInt("timeOffset") timeOffset, _ := params.GetInt("timeOffset")
if format == "raw" || maxBitRate >= audioFile.AudioBitrate() { if format == "raw" {
http.ServeFile(w, r, file.AbsPath()) http.ServeFile(w, r, file.AbsPath())
return nil return nil
} }
pref, err := streamGetTransodePreference(c.dbc, user.ID, params.GetOr("c", "")) client, _ := params.Get("c")
pref, err := streamGetTransodePreference(c.dbc, user.ID, client)
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) { if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
return spec.NewError(0, "couldn't find transcode preference: %v", err) return spec.NewError(0, "couldn't find transcode preference: %v", err)
} }
if pref == nil { if pref == nil {
log.Printf("serving raw file, no transcode preferences found for client %q", client)
http.ServeFile(w, r, file.AbsPath())
return nil
}
if maxBitRate >= audioFile.AudioBitrate() {
log.Printf("serving raw file, requested max bitrate %dk is greater or equal to %dk", maxBitRate, audioFile.AudioBitrate())
http.ServeFile(w, r, file.AbsPath()) http.ServeFile(w, r, file.AbsPath())
return nil return nil
} }
@@ -213,7 +221,7 @@ func (c *Controller) ServeStream(w http.ResponseWriter, r *http.Request) *spec.R
profile = transcode.WithSeek(profile, time.Second*time.Duration(timeOffset)) profile = transcode.WithSeek(profile, time.Second*time.Duration(timeOffset))
} }
log.Printf("trancoding to %q with max bitrate %dk", profile.MIME(), profile.BitRate()) log.Printf("trancoding to %q with at bitrate %dk", profile.MIME(), profile.BitRate())
w.Header().Set("Content-Type", profile.MIME()) w.Header().Set("Content-Type", profile.MIME())
if err := c.transcoder.Transcode(r.Context(), profile, file.AbsPath(), w); err != nil && !errors.Is(err, transcode.ErrFFmpegKilled) { if err := c.transcoder.Transcode(r.Context(), profile, file.AbsPath(), w); err != nil && !errors.Is(err, transcode.ErrFFmpegKilled) {