Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-31 14:33:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add progress reporting to AudioNormalizationTask. (#14306)

Browse Source
This commit is contained in:
Shane Powell 2025-07-28 13:27:24 +12:00 committed by GitHub
parent e86315128d
commit ba54cda774
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 69 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
Emby.Server.Implementations/ScheduledTasks/Tasks/AudioNormalizationTask.cs
View File

@ -76,36 +76,32 @@ public partial class AudioNormalizationTask : IScheduledTask
/// <inheritdoc /> /// <inheritdoc />
public async Task ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken) public async Task ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken)
{ {
foreach (var library in _libraryManager.RootFolder.Children) var numComplete = 0;
{ var libraries = _libraryManager.RootFolder.Children.Where(library => _libraryManager.GetLibraryOptions(library).EnableLUFSScan).ToArray();
var libraryOptions = _libraryManager.GetLibraryOptions(library); double percent = 0;
if (!libraryOptions.EnableLUFSScan)
{
continue;
}
// Album gain foreach (var library in libraries)
var albums = _libraryManager.GetItemList(new InternalItemsQuery
{ {
IncludeItemTypes = [BaseItemKind.MusicAlbum], var albums = _libraryManager.GetItemList(new InternalItemsQuery { IncludeItemTypes = [BaseItemKind.MusicAlbum], Parent = library, Recursive = true });
Parent = library,
Recursive = true double nextPercent = numComplete + 1;
}); nextPercent /= libraries.Length;
nextPercent -= percent;
// Split the progress for this single library into two halves: album gain and track gain.
// The first half will be for album gain, the second half for track gain.
nextPercent /= 2;
var albumComplete = 0;
foreach (var a in albums) foreach (var a in albums)
{ {
if (a.NormalizationGain.HasValue || a.LUFS.HasValue) if (!a.NormalizationGain.HasValue && !a.LUFS.HasValue)
{ {
continue; // Album gain
} var albumTracks = ((MusicAlbum)a).Tracks.Where(x => x.IsFileProtocol).ToList();
// Skip albums that don't have multiple tracks, album gain is useless here // Skip albums that don't have multiple tracks, album gain is useless here
var albumTracks = ((MusicAlbum)a).Tracks.Where(x => x.IsFileProtocol).ToList(); if (albumTracks.Count > 1)
if (albumTracks.Count <= 1)
{ {
continue;
}
_logger.LogInformation("Calculating LUFS for album: {Album} with id: {Id}", a.Name, a.Id); _logger.LogInformation("Calculating LUFS for album: {Album} with id: {Id}", a.Name, a.Id);
var tempDir = _applicationPaths.TempDirectory; var tempDir = _applicationPaths.TempDirectory;
Directory.CreateDirectory(tempDir); Directory.CreateDirectory(tempDir);
@ -124,33 +120,54 @@ public partial class AudioNormalizationTask : IScheduledTask
File.Delete(tempFile); File.Delete(tempFile);
} }
} }
}
// Update sub-progress for album gain
albumComplete++;
double albumPercent = albumComplete;
albumPercent /= albums.Count;
progress.Report(100 * (percent + (albumPercent * nextPercent)));
}
// Update progress to start at the track gain percent calculation
percent += nextPercent;
_itemRepository.SaveItems(albums, cancellationToken); _itemRepository.SaveItems(albums, cancellationToken);
// Track gain // Track gain
var tracks = _libraryManager.GetItemList(new InternalItemsQuery var tracks = _libraryManager.GetItemList(new InternalItemsQuery { MediaTypes = [MediaType.Audio], IncludeItemTypes = [BaseItemKind.Audio], Parent = library, Recursive = true });
{
MediaTypes = [MediaType.Audio],
IncludeItemTypes = [BaseItemKind.Audio],
Parent = library,
Recursive = true
});
var tracksComplete = 0;
foreach (var t in tracks) foreach (var t in tracks)
{ {
if (t.NormalizationGain.HasValue || t.LUFS.HasValue || !t.IsFileProtocol) if (!t.NormalizationGain.HasValue && !t.LUFS.HasValue && t.IsFileProtocol)
{ {
continue;
}
t.LUFS = await CalculateLUFSAsync( t.LUFS = await CalculateLUFSAsync(
string.Format(CultureInfo.InvariantCulture, "-i \"{0}\"", t.Path.Replace("\"", "\\\"", StringComparison.Ordinal)), string.Format(CultureInfo.InvariantCulture, "-i \"{0}\"", t.Path.Replace("\"", "\\\"", StringComparison.Ordinal)),
false, false,
cancellationToken).ConfigureAwait(false); cancellationToken).ConfigureAwait(false);
} }
_itemRepository.SaveItems(tracks, cancellationToken); // Update sub-progress for track gain
tracksComplete++;
double trackPercent = tracksComplete;
trackPercent /= tracks.Count;
progress.Report(100 * (percent + (trackPercent * nextPercent)));
} }
_itemRepository.SaveItems(tracks, cancellationToken);
// Update progress
numComplete++;
percent = numComplete;
percent /= libraries.Length;
progress.Report(100 * percent);
}
progress.Report(100.0);
} }
/// <inheritdoc /> /// <inheritdoc />