owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Subsonic API: make use of the bitrate info in DB to check if transcoding is needed

Browse Source
This commit is contained in:
emeric
2023-11-11 23:28:40 +01:00
parent ebc59dd70c
commit 6d50783511
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/subsonic/impl/entrypoints/MediaRetrieval.cpp
+7 -3
View File
@@ -88,17 +88,19 @@ namespace API::Subsonic
StreamParameters parameters; StreamParameters parameters;
std::size_t bitrate{};
parameters.estimateContentLength = estimateContentLength; parameters.estimateContentLength = estimateContentLength;
auto transaction{ context.dbSession.createSharedTransaction() };
{ {
auto transaction{ context.dbSession.createSharedTransaction() };
const auto track{ Track::find(context.dbSession, id) }; const auto track{ Track::find(context.dbSession, id) };
if (!track) if (!track)
throw RequestedDataNotFoundError{}; throw RequestedDataNotFoundError{};
parameters.inputFileParameters.trackPath = track->getPath(); parameters.inputFileParameters.trackPath = track->getPath();
parameters.inputFileParameters.duration = track->getDuration(); parameters.inputFileParameters.duration = track->getDuration();
bitrate = track->getBitrate() / 1000;
} }
if (format == "raw") // raw => no transcode if (format == "raw") // raw => no transcode
@@ -111,13 +113,15 @@ namespace API::Subsonic
if (const auto streamInfo{ audioFile->getBestStreamInfo() }) if (const auto streamInfo{ audioFile->getBestStreamInfo() })
{ {
// assume reported codec is "mp3", "opus", "vorbis", etc. // assume reported codec is "mp3", "opus", "vorbis", etc.
if (StringUtils::stringCaseInsensitiveEqual(streamInfo->codec, format) && (maxBitRate == 0 || (streamInfo->bitrate / 1000) <= maxBitRate)) if (StringUtils::stringCaseInsensitiveEqual(streamInfo->codec, format) && (maxBitRate == 0 || (bitrate != 0 && bitrate <= maxBitRate)))
{ {
LMS_LOG(API_SUBSONIC, DEBUG) << "stream parameters are compatible with actual file: no transcode"; LMS_LOG(API_SUBSONIC, DEBUG) << "stream parameters are compatible with actual file: no transcode";
return parameters; return parameters;
} }
} }
auto transaction{ context.dbSession.createSharedTransaction() };
const User::pointer user{ User::find(context.dbSession, context.userId) }; const User::pointer user{ User::find(context.dbSession, context.userId) };
if (!user) if (!user)
throw UserNotAuthorizedError{}; throw UserNotAuthorizedError{};