From 9a8f05d826222f85c39ec3bd7249ccf087f5fa37 Mon Sep 17 00:00:00 2001
From: kermieisinthehouse <kermie@isinthe.house>
Date: Mon, 13 Dec 2021 03:09:00 +0000
Subject: [PATCH] Marker previews should respect preview audio setting (#2101)

---
 pkg/ffmpeg/encoder_marker.go                   | 18 +++++++++++++++---
 pkg/manager/task_generate_markers.go           |  1 +
 .../src/components/Changelog/versions/v0120.md |  1 +
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkg/ffmpeg/encoder_marker.go b/pkg/ffmpeg/encoder_marker.go
index 540b8e6c3..61b02bce8 100644
--- a/pkg/ffmpeg/encoder_marker.go
+++ b/pkg/ffmpeg/encoder_marker.go
@@ -10,9 +10,22 @@ type SceneMarkerOptions struct {
 	Seconds    int
 	Width      int
 	OutputPath string
+	Audio      bool
 }
 
 func (e *Encoder) SceneMarkerVideo(probeResult VideoFile, options SceneMarkerOptions) error {
+
+	argsAudio := []string{
+		"-c:a", "aac",
+		"-b:a", "64k",
+	}
+
+	if !options.Audio {
+		argsAudio = []string{
+			"-an",
+		}
+	}
+
 	args := []string{
 		"-v", "error",
 		"-ss", strconv.Itoa(options.Seconds),
@@ -29,11 +42,10 @@ func (e *Encoder) SceneMarkerVideo(probeResult VideoFile, options SceneMarkerOpt
 		"-threads", "4",
 		"-vf", fmt.Sprintf("scale=%v:-2", options.Width),
 		"-sws_flags", "lanczos",
-		"-c:a", "aac",
-		"-b:a", "64k",
 		"-strict", "-2",
-		options.OutputPath,
 	}
+	args = append(args, argsAudio...)
+	args = append(args, options.OutputPath)
 	_, err := e.run(probeResult.Path, args, nil)
 	return err
 }
diff --git a/pkg/manager/task_generate_markers.go b/pkg/manager/task_generate_markers.go
index e9cf7c074..94dcce751 100644
--- a/pkg/manager/task_generate_markers.go
+++ b/pkg/manager/task_generate_markers.go
@@ -117,6 +117,7 @@ func (t *GenerateMarkersTask) generateMarker(videoFile *ffmpeg.VideoFile, scene
 		ScenePath: scene.Path,
 		Seconds:   seconds,
 		Width:     640,
+		Audio:     instance.Config.GetPreviewAudio(),
 	}
 
 	encoder := instance.FFMPEG
diff --git a/ui/v2.5/src/components/Changelog/versions/v0120.md b/ui/v2.5/src/components/Changelog/versions/v0120.md
index 7c2523fcf..875e55025 100644
--- a/ui/v2.5/src/components/Changelog/versions/v0120.md
+++ b/ui/v2.5/src/components/Changelog/versions/v0120.md
@@ -10,6 +10,7 @@
 * Added plugin hook for Tag merge operation. ([#2010](https://github.com/stashapp/stash/pull/2010))
 
 ### 🐛 Bug fixes
+* Don't include audio in marker previews if Include Audio option is unchecked. ([#2101](https://github.com/stashapp/stash/pull/2101))
 * Include performer aliases when scraping from stash-box. ([#2091](https://github.com/stashapp/stash/pull/2091/files))
 * Remove empty folder-based galleries during clean. ([#1954](https://github.com/stashapp/stash/pull/1954))
 * Select first scene result in scene tagger where possible. ([#2051](https://github.com/stashapp/stash/pull/2051))