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

Minor cleanup

Browse Source
This commit is contained in:
emeric
2026-06-21 13:34:18 +02:00
parent 62f4766f82
commit 52b6af434d
4 changed files with 86 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/audio/impl/musicnn/MusicNNEmbeddings.cpp
+3 -3
View File
@@ -32,7 +32,7 @@ namespace lms::audio
namespace
{
constexpr uint32_t byteswap32(uint32_t x)
constexpr std::uint32_t byteswap32(uint32_t x)
{
return (x >> 24) | ((x >> 8) & 0x0000FF00u) | ((x << 8) & 0x00FF0000u) | (x << 24);
}
@@ -44,7 +44,7 @@ namespace lms::audio
for (std::size_t i{}; i < data.size(); ++i)
{
uint32_t bits{ std::bit_cast<uint32_t>(data[i]) };
std::uint32_t bits{ std::bit_cast<std::uint32_t>(data[i]) };
if constexpr (std::endian::native == std::endian::little)
bits = byteswap32(bits);
std::memcpy(blob.data() + i * 4, &bits, 4);
@@ -58,7 +58,7 @@ namespace lms::audio
for (std::size_t i{}; i < data.size(); ++i)
{
uint32_t bits{};
std::uint32_t bits{};
std::memcpy(&bits, blob.data() + i * 4, 4);
if constexpr (std::endian::native == std::endian::little)
bits = byteswap32(bits);
src/lms/ui/admin/debug/PcmDecodingBenchmark.cpp
+38 -15
View File
@@ -162,22 +162,23 @@ namespace lms::ui
if (trackResults.empty())
return;
std::vector<float> rtFactors;
rtFactors.reserve(trackResults.size());
for (const auto& t : trackResults)
rtFactors.push_back(t.realTimeFactor);
const float mean{ std::accumulate(rtFactors.begin(), rtFactors.end(), 0.F) / static_cast<float>(rtFactors.size()) };
const float variance{ std::accumulate(rtFactors.begin(), rtFactors.end(), 0.F, [mean](float acc, float v) {
return acc + (v - mean) * (v - mean);
}) / static_cast<float>(rtFactors.size()) };
const auto [minIt, maxIt]{ std::minmax_element(rtFactors.begin(), rtFactors.end()) };
const std::size_t n{ trackResults.size() };
const float mean{ std::accumulate(trackResults.begin(), trackResults.end(), 0.F, [](float acc, const PcmDecodingBenchmark::TrackDecodeResult& t) {
return acc + t.realTimeFactor;
})
/ static_cast<float>(n) };
const float variance{ std::accumulate(trackResults.begin(), trackResults.end(), 0.F, [mean](float acc, const PcmDecodingBenchmark::TrackDecodeResult& t) {
return acc + (t.realTimeFactor - mean) * (t.realTimeFactor - mean);
})
/ static_cast<float>(n) };
const auto [minIt, maxIt]{ std::minmax_element(trackResults.begin(), trackResults.end(), [](const PcmDecodingBenchmark::TrackDecodeResult& a, const PcmDecodingBenchmark::TrackDecodeResult& b) {
return a.realTimeFactor < b.realTimeFactor;
}) };
allResults.push_back(PcmDecodingBenchmark::CodecResult{
.codecName = std::string{ codecDesc.name.str() },
.tracks = std::move(trackResults),
.minRealTimeFactor = *minIt,
.maxRealTimeFactor = *maxIt,
.minRealTimeFactor = minIt->realTimeFactor,
.maxRealTimeFactor = maxIt->realTimeFactor,
.meanRealTimeFactor = mean,
.stdDevRealTimeFactor = std::sqrt(variance),
});
@@ -199,6 +200,24 @@ namespace lms::ui
return _state;
}
std::vector<PcmDecodingBenchmark::CodecResult> PcmDecodingBenchmark::getResults() const
{
std::scoped_lock lock{ _mutex };
return _results;
}
std::chrono::milliseconds PcmDecodingBenchmark::getElapsed() const
{
std::scoped_lock lock{ _mutex };
return _elapsed;
}
std::string PcmDecodingBenchmark::getReportFilename() const
{
std::scoped_lock lock{ _mutex };
return _reportFilename;
}
void PcmDecodingBenchmark::start(db::IDb& db)
{
{
@@ -208,7 +227,7 @@ namespace lms::ui
if (_state == State::Running)
return;
_reportFilename = "LMS_pcm_decoding_stats_" + core::stringUtils::toISO8601String(Wt::WDateTime::currentDateTime()) + ".txt";
prevState = _state;
_state = State::Running;
@@ -250,7 +269,11 @@ namespace lms::ui
void PcmDecodingBenchmark::postStateToAllSessions(State oldState, State newState)
{
Wt::WServer::instance()->postAll([this, oldState, newState] {
auto* server{ Wt::WServer::instance() };
if (!server)
return;
server->postAll([this, oldState, newState] {
if (!LmsApp)
return;
src/lms/ui/admin/debug/PcmDecodingBenchmark.hpp
+9 -5
View File
@@ -23,7 +23,6 @@
#include <filesystem>
#include <functional>
#include <mutex>
#include <span>
#include <string>
#include <unordered_map>
#include <vector>
@@ -40,7 +39,12 @@ namespace lms::ui
class PcmDecodingBenchmark
{
public:
enum class State { Idle, Running, Completed };
enum class State
{
Idle,
Running,
Completed
};
struct TrackDecodeResult
{
@@ -64,9 +68,9 @@ namespace lms::ui
static PcmDecodingBenchmark& instance();
State getState() const;
std::span<const CodecResult> getResults() const { return _results; }
std::chrono::milliseconds getElapsed() const { return _elapsed; }
std::string_view getReportFilename() const { return _reportFilename; }
std::vector<CodecResult> getResults() const;
std::chrono::milliseconds getElapsed() const;
std::string getReportFilename() const;
void start(db::IDb& db);
src/lms/ui/admin/debug/PcmDecodingStats.cpp
+36 -24
View File
@@ -21,9 +21,9 @@
#include <algorithm>
#include <chrono>
#include <span>
#include <cmath>
#include <numeric>
#include <iomanip>
#include <limits>
#include <sstream>
#include <vector>
@@ -48,8 +48,8 @@ namespace lms::ui
class PcmDecodingStatsResource : public Wt::WResource
{
public:
PcmDecodingStatsResource(std::span<const PcmDecodingBenchmark::CodecResult> results, std::chrono::milliseconds elapsed, std::string filename)
: _results{ results.begin(), results.end() }
PcmDecodingStatsResource(std::vector<PcmDecodingBenchmark::CodecResult> results, std::chrono::milliseconds elapsed, std::string filename)
: _results{ std::move(results) }
, _elapsed{ elapsed }
, _filename{ std::move(filename) }
{
@@ -75,9 +75,14 @@ namespace lms::ui
const std::string cdp{ encodeHttpHeaderField("filename", _filename) };
response.addHeader("Content-Disposition", "attachment; " + cdp);
response.out() << std::fixed << std::setprecision(1);
response.out() << "PCM decoding bench (elapsed: " << std::chrono::duration_cast<std::chrono::seconds>(_elapsed).count() << "s)\n\n";
std::vector<float> allRtFactors;
std::size_t totalTracks{};
float globalMin{ std::numeric_limits<float>::max() };
float globalMax{ std::numeric_limits<float>::lowest() };
float weightedMeanSum{};
for (const PcmDecodingBenchmark::CodecResult& r : _results)
{
response.out() << "=== " << r.codecName << " (" << r.tracks.size() << " track(s)) ===\n";
@@ -88,32 +93,39 @@ namespace lms::ui
response.out() << " " << t.path
<< " bitrate=" << t.bitrate / 1000 << " kbps"
<< " duration=" << durationSec / 60 << "m" << durationSec % 60 << "s"
<< " real_time_factor=" << static_cast<long>(t.realTimeFactor) << "x"
<< " speed=" << static_cast<long>(t.speedKBs) << " KB/s\n";
allRtFactors.push_back(t.realTimeFactor);
<< " real_time_factor=" << t.realTimeFactor << "x"
<< " speed=" << t.speedKBs << " KB/s\n";
}
response.out() << " real_time_factor summary:"
<< " min=" << static_cast<long>(r.minRealTimeFactor) << "x"
<< " max=" << static_cast<long>(r.maxRealTimeFactor) << "x"
<< " mean=" << static_cast<long>(r.meanRealTimeFactor) << "x"
<< " stddev=" << static_cast<long>(r.stdDevRealTimeFactor) << "x\n\n";
<< " min=" << r.minRealTimeFactor << "x"
<< " max=" << r.maxRealTimeFactor << "x"
<< " mean=" << r.meanRealTimeFactor << "x"
<< " stddev=" << r.stdDevRealTimeFactor << "x\n\n";
totalTracks += r.tracks.size();
globalMin = std::min(globalMin, r.minRealTimeFactor);
globalMax = std::max(globalMax, r.maxRealTimeFactor);
weightedMeanSum += r.meanRealTimeFactor * static_cast<float>(r.tracks.size());
}
if (!allRtFactors.empty())
if (totalTracks > 0)
{
const float mean{ std::accumulate(allRtFactors.begin(), allRtFactors.end(), 0.F) / static_cast<float>(allRtFactors.size()) };
const float variance{ std::accumulate(allRtFactors.begin(), allRtFactors.end(), 0.F, [mean](float acc, float v) {
return acc + (v - mean) * (v - mean);
}) / static_cast<float>(allRtFactors.size()) };
const float globalMean{ weightedMeanSum / static_cast<float>(totalTracks) };
response.out() << "=== OVERALL (" << allRtFactors.size() << " track(s)) ===\n";
const auto [minIt, maxIt]{ std::minmax_element(allRtFactors.begin(), allRtFactors.end()) };
float weightedVarianceSum{};
for (const PcmDecodingBenchmark::CodecResult& r : _results)
{
const float d{ r.meanRealTimeFactor - globalMean };
weightedVarianceSum += static_cast<float>(r.tracks.size()) * (r.stdDevRealTimeFactor * r.stdDevRealTimeFactor + d * d);
}
response.out() << "=== OVERALL (" << totalTracks << " track(s)) ===\n";
response.out() << " real_time_factor summary:"
<< " min=" << static_cast<long>(*minIt) << "x"
<< " max=" << static_cast<long>(*maxIt) << "x"
<< " mean=" << static_cast<long>(mean) << "x"
<< " stddev=" << static_cast<long>(std::sqrtf(variance)) << "x\n";
<< " min=" << globalMin << "x"
<< " max=" << globalMax << "x"
<< " mean=" << globalMean << "x"
<< " stddev=" << std::sqrt(weightedVarianceSum / static_cast<float>(totalTracks)) << "x\n";
}
}
@@ -190,7 +202,7 @@ namespace lms::ui
void PcmDecodingStats::setupDownloadButton()
{
auto& bench{ PcmDecodingBenchmark::instance() };
auto resource{ std::make_shared<PcmDecodingStatsResource>(bench.getResults(), bench.getElapsed(), std::string{ bench.getReportFilename() } ) };
auto resource{ std::make_shared<PcmDecodingStatsResource>(bench.getResults(), bench.getElapsed(), bench.getReportFilename()) };
Wt::WLink link{ resource };
link.setTarget(Wt::LinkTarget::NewWindow);