Merge branch 'honor-max-bitrate' into develop

2025-01-12 20:56:07 +01:00
parent eda06c8214 cfacfcff46
commit 4a75e5220e
1 changed files with 4 additions and 1 deletions
@@ -176,10 +176,13 @@ namespace lms::api::subsonic
                bitrate = maxBitRate;
            }

+            // Need to transcode here
            if (!requestedFormat)
                requestedFormat = userTranscodeFormatToAvFormat(context.user->getSubsonicDefaultTranscodingOutputFormat());
            if (!bitrate)
-                bitrate = std::min<std::size_t>(context.user->getSubsonicDefaultTranscodingOutputBitrate(), maxBitRate);
+                bitrate = context.user->getSubsonicDefaultTranscodingOutputBitrate();
+            if (maxBitRate)
+                bitrate = std::min<std::size_t>(bitrate, maxBitRate);

            av::transcoding::OutputParameters& outputParameters{ parameters.outputParameters.emplace() };