remote/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2026-10-08 02:17:25 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 68cde4d35b into 52135913d4

Browse source
This commit is contained in:
quepasaquepasa 2026-10-08 02:04:14 +08:00 • committed by GitHub
commit 7cd7dc1cc7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 97 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
consts/consts.go
View file

@ -183,7 +183,10 @@ var (
Name: "mp3 audio",
TargetFormat: "mp3",
DefaultBitRate: 192,
Command: "ffmpeg -ss %t -i %s -map 0:a:0 -map_metadata 0 -map_metadata 0:s:a:0 -b:a %bk -v 0 -f mp3 -",
// 0:v:0? also carries over embedded cover art, when the source has any. Only
// mp3 and flac are given this treatment: the opus and adts muxers reject a
// video stream outright.
Command: "ffmpeg -ss %t -i %s -map 0:a:0 -map 0:v:0? -map_metadata 0 -map_metadata 0:s:a:0 -b:a %bk -v 0 -c:v copy -disposition:v attached_pic -f mp3 -",
},
{
Name: "opus audio",
@ -201,7 +204,7 @@ var (
Name: "flac audio",
TargetFormat: "flac",
DefaultBitRate: 0,
Command: "ffmpeg -ss %t -i %s -map 0:a:0 -map_metadata 0 -map_metadata 0:s:a:0 -v 0 -c:a flac -f flac -",
Command: "ffmpeg -ss %t -i %s -map 0:a:0 -map 0:v:0? -map_metadata 0 -map_metadata 0:s:a:0 -v 0 -c:a flac -c:v copy -disposition:v attached_pic -f flac -",
},
}
)

16
core/ffmpeg/ffmpeg.go
View file

@ -433,6 +433,14 @@ var formatOutputMap = map[string]string{
"flac": "flac",
}
// formatKeepsCoverArt lists the target formats whose muxer accepts an attached
// picture. opus ("Unsupported codec id in stream 1") and adts ("adts muxer does
// not support any stream of type video") reject one, so artwork is dropped there.
var formatKeepsCoverArt = map[string]bool{
"mp3": true,
"flac": true,
}
// defaultCommands is used to detect whether a user has customized their transcoding command.
var defaultCommands = func() map[string]string {
m := make(map[string]string, len(consts.DefaultTranscodings))
@ -460,6 +468,14 @@ func buildDynamicArgs(opts TranscodeOptions) []string {
args = append(args, "-i", opts.FilePath)
args = append(args, "-map", "0:a:0")
// Carry over embedded cover art, when the source has any. The trailing "?"
// keeps the mapping optional so sources without artwork still transcode.
// Only mp3 and flac: the opus muxer rejects the mjpeg stream and adts
// refuses any video stream, so mapping it there breaks transcoding outright.
if formatKeepsCoverArt[opts.Format] {
args = append(args, "-map", "0:v:0?", "-c:v", "copy", "-disposition:v", "attached_pic")
}
// Preserve source tags. -map_metadata 0 copies format-level tags (MP3/FLAC);
// -map_metadata 0:s:a:0 copies tags from the first audio stream (OPUS/OGG).
// Both are needed because the two source families store tags at different

22
core/ffmpeg/ffmpeg_test.go
View file

@ -77,7 +77,7 @@ var _ = Describe("ffmpeg", func() {
Describe("isDefaultCommand", func() {
It("returns true for known default mp3 command", func() {
Expect(isDefaultCommand("mp3", "ffmpeg -ss %t -i %s -map 0:a:0 -map_metadata 0 -map_metadata 0:s:a:0 -b:a %bk -v 0 -f mp3 -")).To(BeTrue())
Expect(isDefaultCommand("mp3", "ffmpeg -ss %t -i %s -map 0:a:0 -map 0:v:0? -map_metadata 0 -map_metadata 0:s:a:0 -b:a %bk -v 0 -c:v copy -disposition:v attached_pic -f mp3 -")).To(BeTrue())
})
It("returns true for known default opus command", func() {
Expect(isDefaultCommand("opus", "ffmpeg -ss %t -i %s -map 0:a:0 -map_metadata 0 -map_metadata 0:s:a:0 -b:a %bk -v 0 -c:a libopus -f opus -")).To(BeTrue())
@ -86,7 +86,7 @@ var _ = Describe("ffmpeg", func() {
Expect(isDefaultCommand("aac", "ffmpeg -ss %t -i %s -map 0:a:0 -map_metadata 0 -map_metadata 0:s:a:0 -b:a %bk -v 0 -c:a aac -f adts -")).To(BeTrue())
})
It("returns true for known default flac command", func() {
Expect(isDefaultCommand("flac", "ffmpeg -ss %t -i %s -map 0:a:0 -map_metadata 0 -map_metadata 0:s:a:0 -v 0 -c:a flac -f flac -")).To(BeTrue())
Expect(isDefaultCommand("flac", "ffmpeg -ss %t -i %s -map 0:a:0 -map 0:v:0? -map_metadata 0 -map_metadata 0:s:a:0 -v 0 -c:a flac -c:v copy -disposition:v attached_pic -f flac -")).To(BeTrue())
})
It("returns false for a custom command", func() {
Expect(isDefaultCommand("mp3", "ffmpeg -i %s -b:a %bk -custom-flag -f mp3 -")).To(BeFalse())
@ -108,6 +108,7 @@ var _ = Describe("ffmpeg", func() {
Expect(args).To(Equal([]string{
"ffmpeg", "-i", "/music/file.flac",
"-map", "0:a:0",
"-map", "0:v:0?", "-c:v", "copy", "-disposition:v", "attached_pic",
"-map_metadata", "0", "-map_metadata", "0:s:a:0",
"-c:a", "libmp3lame",
"-b:a", "256k",
@ -128,6 +129,7 @@ var _ = Describe("ffmpeg", func() {
Expect(args).To(Equal([]string{
"ffmpeg", "-i", "/music/file.dsf",
"-map", "0:a:0",
"-map", "0:v:0?", "-c:v", "copy", "-disposition:v", "attached_pic",
"-map_metadata", "0", "-map_metadata", "0:s:a:0",
"-c:a", "flac",
"-ar", "48000",
@ -155,6 +157,20 @@ var _ = Describe("ffmpeg", func() {
}))
})
It("does not map cover art for muxers that reject it", func() {
// The opus and adts muxers refuse a video stream outright, so mapping
// the attached picture there would break transcoding rather than
// preserve artwork.
for _, format := range []string{"opus", "aac"} {
args := buildDynamicArgs(TranscodeOptions{
Format: format,
FilePath: "/music/file.flac",
BitRate: 128,
})
Expect(strings.Join(args, " ")).ToNot(ContainSubstring("0:v:0?"), format)
}
})
It("includes offset when specified", func() {
args := buildDynamicArgs(TranscodeOptions{
Format: "mp3",
@ -167,6 +183,7 @@ var _ = Describe("ffmpeg", func() {
"-ss", "30",
"-i", "/music/file.mp3",
"-map", "0:a:0",
"-map", "0:v:0?", "-c:v", "copy", "-disposition:v", "attached_pic",
"-map_metadata", "0", "-map_metadata", "0:s:a:0",
"-c:a", "libmp3lame",
"-b:a", "192k",
@ -203,6 +220,7 @@ var _ = Describe("ffmpeg", func() {
Expect(args).To(Equal([]string{
"ffmpeg", "-i", "/music/file.dsf",
"-map", "0:a:0",
"-map", "0:v:0?", "-c:v", "copy", "-disposition:v", "attached_pic",
"-map_metadata", "0", "-map_metadata", "0:s:a:0",
"-c:a", "flac",
"-sample_fmt", "s32",

56
db/migrations/20260731004500_keep_cover_art_in_default_transcodings.go Normal file
View file

@ -0,0 +1,56 @@
package migrations
import (
"context"
"database/sql"
"github.com/pressly/goose/v3"
)
func init() {
goose.AddMigrationContext(upKeepCoverArtInDefaultTranscodings, downKeepCoverArtInDefaultTranscodings)
}
// coverArtPairs maps the current default commands (audio stream only) to the new
// defaults that also carry over embedded cover art. Index 0 = old, index 1 = new.
//
// `-map 0:v:0?` picks up the attached picture when the source has one, and the
// trailing `?` keeps the command working for sources without artwork. `-c:v copy`
// avoids re-encoding it and `-disposition:v attached_pic` marks it as cover art
// rather than a video track.
//
// Only mp3 and flac are updated: the opus muxer rejects the mjpeg stream
// ("Unsupported codec id in stream 1") and adts refuses any video stream
// ("adts muxer does not support any stream of type video"), so adding the
// mapping there would break transcoding to those formats outright.
//
// Only rows still holding the exact unmodified default are updated, so any
// user-customized command is left untouched.
var coverArtPairs = [][2]string{
{
"ffmpeg -ss %t -i %s -map 0:a:0 -map_metadata 0 -map_metadata 0:s:a:0 -b:a %bk -v 0 -f mp3 -",
"ffmpeg -ss %t -i %s -map 0:a:0 -map 0:v:0? -map_metadata 0 -map_metadata 0:s:a:0 -b:a %bk -v 0 -c:v copy -disposition:v attached_pic -f mp3 -",
},
{
"ffmpeg -ss %t -i %s -map 0:a:0 -map_metadata 0 -map_metadata 0:s:a:0 -v 0 -c:a flac -f flac -",
"ffmpeg -ss %t -i %s -map 0:a:0 -map 0:v:0? -map_metadata 0 -map_metadata 0:s:a:0 -v 0 -c:a flac -c:v copy -disposition:v attached_pic -f flac -",
},
}
func upKeepCoverArtInDefaultTranscodings(ctx context.Context, tx *sql.Tx) error {
for _, p := range coverArtPairs {
if _, err := tx.ExecContext(ctx, `UPDATE transcoding SET command = ? WHERE command = ?`, p[1], p[0]); err != nil {
return err
}
}
return nil
}
func downKeepCoverArtInDefaultTranscodings(ctx context.Context, tx *sql.Tx) error {
for _, p := range coverArtPairs {
if _, err := tx.ExecContext(ctx, `UPDATE transcoding SET command = ? WHERE command = ?`, p[0], p[1]); err != nil {
return err
}
}
return nil
}