Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-02 13:15:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Backport pull request #11910 from jellyfin/release-10.9.z

Browse Source 
Audio normalization: parse ffmpeg output line by line

Original-merge: d2be2ee480a44d3ed266d4632c3f38439b0dfaf5

Merged-by: joshuaboniface <joshua@boniface.me>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
Bond-009 2024-06-01 18:41:15 -04:00 committed by Joshua M. Boniface
parent 4fa3c30df2
commit c7f87c0d69
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Jellyfin.Data.Enums; using Jellyfin.Data.Enums;
using Jellyfin.Extensions;
using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Entities.Audio;
@ -69,7 +70,7 @@ public partial class AudioNormalizationTask : IScheduledTask
/// <inheritdoc /> /// <inheritdoc />
public string Key => "AudioNormalization"; public string Key => "AudioNormalization";
[GeneratedRegex(@"I:\s+(.*?)\s+LUFS")] [GeneratedRegex(@"^\s+I:\s+(.*?)\s+LUFS")]
private static partial Regex LUFSRegex(); private static partial Regex LUFSRegex();
/// <inheritdoc /> /// <inheritdoc />
@ -179,16 +180,17 @@ public partial class AudioNormalizationTask : IScheduledTask
} }
using var reader = process.StandardError; using var reader = process.StandardError;
var output = await reader.ReadToEndAsync(cancellationToken).ConfigureAwait(false); await foreach (var line in reader.ReadAllLinesAsync(cancellationToken))
cancellationToken.ThrowIfCancellationRequested();
MatchCollection split = LUFSRegex().Matches(output);
if (split.Count != 0)
{ {
return float.Parse(split[0].Groups[1].ValueSpan, CultureInfo.InvariantCulture.NumberFormat); Match match = LUFSRegex().Match(line);
if (match.Success)
{
return float.Parse(match.Groups[1].ValueSpan, CultureInfo.InvariantCulture.NumberFormat);
}
} }
_logger.LogError("Failed to find LUFS value in output:\n{Output}", output); _logger.LogError("Failed to find LUFS value in output");
return null; return null;
} }
} }

7
src/Jellyfin.Extensions/StreamExtensions.cs
View File

@ -1,7 +1,9 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.CompilerServices;
using System.Text; using System.Text;
using System.Threading;
namespace Jellyfin.Extensions namespace Jellyfin.Extensions
{ {
@ -48,11 +50,12 @@ namespace Jellyfin.Extensions
/// Reads all lines in the <see cref="TextReader" />. /// Reads all lines in the <see cref="TextReader" />.
/// </summary> /// </summary>
/// <param name="reader">The <see cref="TextReader" /> to read from.</param> /// <param name="reader">The <see cref="TextReader" /> to read from.</param>
/// <param name="cancellationToken">The token to monitor for cancellation requests.</param>
/// <returns>All lines in the stream.</returns> /// <returns>All lines in the stream.</returns>
public static async IAsyncEnumerable<string> ReadAllLinesAsync(this TextReader reader) public static async IAsyncEnumerable<string> ReadAllLinesAsync(this TextReader reader, [EnumeratorCancellation] CancellationToken cancellationToken = default)
{ {
string? line; string? line;
while ((line = await reader.ReadLineAsync().ConfigureAwait(false)) is not null) while ((line = await reader.ReadLineAsync(cancellationToken).ConfigureAwait(false)) is not null)
{ {
yield return line; yield return line;
} }