Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Media Info audio channel parsing of dual mono audio 

Fixes #2182
This commit is contained in:
Mark McDowall 2017-09-21 17:44:09 -07:00
parent 714ce2640b
commit 7b7f48a0e3
No known key found for this signature in database
GPG Key ID: D4CEFA9A718052E0
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/NzbDrone.Core.Test/MediaFiles/MediaInfo/MediaInfoFormatterTests/FormatAudioChannelsFixture.cs
View File

@ -1,4 +1,4 @@
using FluentAssertions; using FluentAssertions;
using NUnit.Framework; using NUnit.Framework;
using NzbDrone.Core.MediaFiles.MediaInfo; using NzbDrone.Core.MediaFiles.MediaInfo;
using NzbDrone.Test.Common; using NzbDrone.Test.Common;
@ -131,5 +131,19 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
MediaInfoFormatter.FormatAudioChannels(mediaInfoModel).Should().Be(7.1m); MediaInfoFormatter.FormatAudioChannels(mediaInfoModel).Should().Be(7.1m);
} }
[Test]
public void should_sum_dual_mono_representation_AudioChannelPositions()
{
var mediaInfoModel = new MediaInfoModel
{
AudioChannels = 2,
AudioChannelPositions = "1+1",
AudioChannelPositionsText = null,
SchemaRevision = 3
};
MediaInfoFormatter.FormatAudioChannels(mediaInfoModel).Should().Be(2.0m);
}
} }
} }

16
src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoFormatter.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@ -35,11 +35,17 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
return mediaInfo.AudioChannelPositionsText.ContainsIgnoreCase("LFE") ? audioChannels - 1 + 0.1m : audioChannels; return mediaInfo.AudioChannelPositionsText.ContainsIgnoreCase("LFE") ? audioChannels - 1 + 0.1m : audioChannels;
} }
if (audioChannelPositions.Contains("+"))
{
return audioChannelPositions.Split('+')
.Sum(s => decimal.Parse(s.Trim(), CultureInfo.InvariantCulture));
}
return audioChannelPositions.Replace("Object Based / ", "") return audioChannelPositions.Replace("Object Based / ", "")
.Split(new string[] { " / " }, StringSplitOptions.RemoveEmptyEntries) .Split(new string[] { " / " }, StringSplitOptions.RemoveEmptyEntries)
.First() .First()
.Split('/') .Split('/')
.Sum(s => decimal.Parse(s, CultureInfo.InvariantCulture)); .Sum(s => decimal.Parse(s, CultureInfo.InvariantCulture));
} }
public static string FormatAudioCodec(MediaInfoModel mediaInfo, string sceneName) public static string FormatAudioCodec(MediaInfoModel mediaInfo, string sceneName)