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

Implement client-preferred bitrate support in StreamTrack()

Browse Source
This commit is contained in:
Serge Tkatchouk
2020-02-21 15:31:42 +08:00
committed by sentriz
parent ca0ec6da15
commit db7c965a65
2 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
server/ctrlsubsonic/handlers_cache.go
View File

@@ -14,40 +14,41 @@ import (
type encoderProfile struct { type encoderProfile struct {
format string format string
bitrate string bitrate int
ffmpegOptions []string ffmpegOptions []string
forceRG bool forceRG bool
} }
var ( var (
encProfiles = map[string]*encoderProfile{ encProfiles = map[string]*encoderProfile{
"mp3": {"mp3", "128k", []string{"-c:a", "libmp3lame"}, false}, "mp3": {"mp3", 128, []string{"-c:a", "libmp3lame"}, false},
"mp3_rg": {"mp3", "128k", []string{"-c:a", "libmp3lame"}, true}, "mp3_rg": {"mp3", 128, []string{"-c:a", "libmp3lame"}, true},
"opus": {"opus", "96k", []string{"-c:a", "libopus", "-vbr", "constrained"}, false}, "opus": {"opus", 96, []string{"-c:a", "libopus", "-vbr", "constrained"}, false},
"opus_rg": {"opus", "96k", []string{"-c:a", "libopus", "-vbr", "constrained"}, true}, "opus_rg": {"opus", 96, []string{"-c:a", "libopus", "-vbr", "constrained"}, true},
} }
bufLen = 4096 bufLen = 4096
) )
func StreamTrack(w http.ResponseWriter, r *http.Request, trackPath string, client string, cachePath string) { func StreamTrack(w http.ResponseWriter, r *http.Request, trackPath string, client string, clBitrate int, cachePath string) {
// Guess required format based on client: // Guess required format based on client:
profileName := detectFormat(client) profileName := detectFormat(client)
profile := encProfiles[profileName] profile := encProfiles[profileName]
bitrate := getBitrate(clBitrate, profile)
cacheFile := path.Join(cachePath, getCacheKey(trackPath, profileName)) cacheFile := path.Join(cachePath, getCacheKey(trackPath, profileName, bitrate))
if fileExists(cacheFile) { if fileExists(cacheFile) {
fmt.Printf("`%s`: cache [%s/%s] hit!\n", trackPath, profile.format, profile.bitrate) fmt.Printf("`%s`: cache [%s/%s] hit!\n", trackPath, profile.format, bitrate)
http.ServeFile(w, r, cacheFile) http.ServeFile(w, r, cacheFile)
} else { } else {
fmt.Printf("`%s`: cache [%s/%s] miss!\n", trackPath, profile.format, profile.bitrate) fmt.Printf("`%s`: cache [%s/%s] miss!\n", trackPath, profile.format, bitrate)
encodeTrack(w, r, trackPath, cacheFile, profile) encodeTrack(w, trackPath, cacheFile, profile, bitrate)
} }
} }
func encodeTrack(w http.ResponseWriter, r *http.Request, trackPath string, cachePath string, profile *encoderProfile) { func encodeTrack(w http.ResponseWriter, trackPath string, cachePath string, profile *encoderProfile, bitrate string) {
// Prepare the command and file descriptors: // Prepare the command and file descriptors:
cmd := ffmpegCommand(trackPath, profile) cmd := ffmpegCommand(trackPath, profile, bitrate)
pipeReader, pipeWriter := io.Pipe() pipeReader, pipeWriter := io.Pipe()
cmd.Stdout = pipeWriter cmd.Stdout = pipeWriter
cmd.Stderr = pipeWriter cmd.Stderr = pipeWriter
@@ -78,7 +79,7 @@ func encodeTrack(w http.ResponseWriter, r *http.Request, trackPath string, cache
} }
cacheFile.Close() cacheFile.Close()
fmt.Printf("`%s`: Encoded track to [%s/%s] successfully\n", trackPath, profile.format, profile.bitrate) fmt.Printf("`%s`: Encoded track to [%s/%s] successfully\n", trackPath, profile.format, bitrate)
} }
// Copy command output to HTTP response body using io.Copy (simpler, but may increase TTFB) // Copy command output to HTTP response body using io.Copy (simpler, but may increase TTFB)
@@ -133,10 +134,10 @@ func fileExists(filename string) bool {
} }
// Pre-format the FFmpeg command with needed options: // Pre-format the FFmpeg command with needed options:
func ffmpegCommand(filePath string, profile *encoderProfile) *exec.Cmd { func ffmpegCommand(filePath string, profile *encoderProfile, bitrate string) *exec.Cmd {
ffmpegArgs := []string{ ffmpegArgs := []string{
"-v", "0", "-i", filePath, "-map", "0:0", "-v", "0", "-i", filePath, "-map", "0:0",
"-vn", "-b:a", profile.bitrate, "-vn", "-b:a", bitrate,
} }
ffmpegArgs = append(ffmpegArgs, profile.ffmpegOptions...) ffmpegArgs = append(ffmpegArgs, profile.ffmpegOptions...)
if profile.forceRG { if profile.forceRG {
@@ -167,7 +168,16 @@ func detectFormat(client string) (profile string) {
} }
// Generate cache key (file name). For, you know, encoded tracks cache. // Generate cache key (file name). For, you know, encoded tracks cache.
func getCacheKey(sourcePath string, profile string) string { func getCacheKey(sourcePath string, profile string, bitrate string) string {
format := encProfiles[profile].format format := encProfiles[profile].format
return fmt.Sprintf("%x-%s.%s", xxhash.Sum64String(sourcePath), profile, format) return fmt.Sprintf("%x-%s-%s.%s", xxhash.Sum64String(sourcePath), profile, bitrate, format)
}
// Check if client forces bitrate lower than set in profile:
func getBitrate(clientBitrate int, profile *encoderProfile) string {
bitrate := profile.bitrate
if clientBitrate != 0 && clientBitrate < profile.bitrate {
bitrate = clientBitrate
}
return fmt.Sprintf("%dk", bitrate)
} }

2
server/ctrlsubsonic/handlers_raw.go
View File

@@ -73,7 +73,7 @@ func (c *Controller) ServeStream(w http.ResponseWriter, r *http.Request) *spec.R
track.Album.RightPath, track.Album.RightPath,
track.Filename, track.Filename,
) )
StreamTrack(w, r, absPath, client, c.CachePath) StreamTrack(w, r, absPath, client, bitrate, c.CachePath)
// //
// after we've served the file, mark the album as played // after we've served the file, mark the album as played