Merge branch 'honor-max-bitrate' into develop

This commit is contained in:
emeric
2025-01-12 20:56:07 +01:00
@@ -176,10 +176,13 @@ namespace lms::api::subsonic
bitrate = maxBitRate; bitrate = maxBitRate;
} }
// Need to transcode here
if (!requestedFormat) if (!requestedFormat)
requestedFormat = userTranscodeFormatToAvFormat(context.user->getSubsonicDefaultTranscodingOutputFormat()); requestedFormat = userTranscodeFormatToAvFormat(context.user->getSubsonicDefaultTranscodingOutputFormat());
if (!bitrate) 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() }; av::transcoding::OutputParameters& outputParameters{ parameters.outputParameters.emplace() };