Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13593 from Bond-009/stupidwindows

Browse Source 
Wait for ffmpeg to exit on Windows before we try deleting the concat file
This commit is contained in:
Bond-009 2025-02-25 21:27:54 +01:00 committed by GitHub
commit 346f36bc09
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,6 +116,7 @@ public partial class AudioNormalizationTask : IScheduledTask
{ {
a.LUFS = await CalculateLUFSAsync( a.LUFS = await CalculateLUFSAsync(
string.Format(CultureInfo.InvariantCulture, "-f concat -safe 0 -i \"{0}\"", tempFile), string.Format(CultureInfo.InvariantCulture, "-f concat -safe 0 -i \"{0}\"", tempFile),
OperatingSystem.IsWindows(), // Wait for process to exit on Windows before we try deleting the concat file
cancellationToken).ConfigureAwait(false); cancellationToken).ConfigureAwait(false);
} }
finally finally
@ -142,7 +143,10 @@ public partial class AudioNormalizationTask : IScheduledTask
continue; continue;
} }
t.LUFS = await CalculateLUFSAsync(string.Format(CultureInfo.InvariantCulture, "-i \"{0}\"", t.Path.Replace("\"", "\\\"", StringComparison.Ordinal)), cancellationToken).ConfigureAwait(false); t.LUFS = await CalculateLUFSAsync(
string.Format(CultureInfo.InvariantCulture, "-i \"{0}\"", t.Path.Replace("\"", "\\\"", StringComparison.Ordinal)),
false,
cancellationToken).ConfigureAwait(false);
} }
_itemRepository.SaveItems(tracks, cancellationToken); _itemRepository.SaveItems(tracks, cancellationToken);
@ -162,7 +166,7 @@ public partial class AudioNormalizationTask : IScheduledTask
]; ];
} }
private async Task<float?> CalculateLUFSAsync(string inputArgs, CancellationToken cancellationToken) private async Task<float?> CalculateLUFSAsync(string inputArgs, bool waitForExit, CancellationToken cancellationToken)
{ {
var args = $"-hide_banner {inputArgs} -af ebur128=framelog=verbose -f null -"; var args = $"-hide_banner {inputArgs} -af ebur128=framelog=verbose -f null -";
@ -189,18 +193,28 @@ public partial class AudioNormalizationTask : IScheduledTask
} }
using var reader = process.StandardError; using var reader = process.StandardError;
float? lufs = null;
await foreach (var line in reader.ReadAllLinesAsync(cancellationToken)) await foreach (var line in reader.ReadAllLinesAsync(cancellationToken))
{ {
Match match = LUFSRegex().Match(line); Match match = LUFSRegex().Match(line);
if (match.Success) if (match.Success)
{ {
return float.Parse(match.Groups[1].ValueSpan, CultureInfo.InvariantCulture.NumberFormat); lufs = float.Parse(match.Groups[1].ValueSpan, CultureInfo.InvariantCulture.NumberFormat);
break;
} }
} }
_logger.LogError("Failed to find LUFS value in output"); if (lufs is null)
return null; {
_logger.LogError("Failed to find LUFS value in output");
}
if (waitForExit)
{
await process.WaitForExitAsync(cancellationToken).ConfigureAwait(false);
}
return lufs;
} }
} }
} }