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

Fixed: FLAC audio channels in media info

This commit is contained in:
Taloth Saldono 2021-01-25 21:32:58 +01:00
parent 53f5694535
commit ab45910e56
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,6 +64,21 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
MediaInfoFormatter.FormatAudioChannels(mediaInfoModel).Should().Be(2); MediaInfoFormatter.FormatAudioChannels(mediaInfoModel).Should().Be(2);
} }
[Test]
public void should_use_AudioChannels_if_schema_revision_is_3_and_AudioChannelPositions_is_0()
{
var mediaInfoModel = new MediaInfoModel
{
AudioFormat = "FLAC",
AudioChannelsContainer = 6,
AudioChannelPositions = "0/0/0",
AudioChannelPositionsTextContainer = null,
SchemaRevision = 3
};
MediaInfoFormatter.FormatAudioChannels(mediaInfoModel).Should().Be(5.1m);
}
[Test] [Test]
public void should_sum_AudioChannelPositions() public void should_sum_AudioChannelPositions()
{ {
@ -128,6 +143,21 @@ 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_format_6_channel_zero_as_51_if_flac()
{
var mediaInfoModel = new MediaInfoModel
{
AudioFormat = "FLAC",
AudioChannelsContainer = 6,
AudioChannelPositions = "0/0/0",
AudioChannelPositionsTextContainer = null,
SchemaRevision = 3
};
MediaInfoFormatter.FormatAudioChannels(mediaInfoModel).Should().Be(5.1m);
}
[Test] [Test]
public void should_ignore_culture_on_channel_summary() public void should_ignore_culture_on_channel_summary()
{ {

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

@ -18,12 +18,12 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
{ {
var audioChannels = FormatAudioChannelsFromAudioChannelPositions(mediaInfo); var audioChannels = FormatAudioChannelsFromAudioChannelPositions(mediaInfo);
if (audioChannels == null) if (audioChannels == null || audioChannels == 0.0m)
{ {
audioChannels = FormatAudioChannelsFromAudioChannelPositionsText(mediaInfo); audioChannels = FormatAudioChannelsFromAudioChannelPositionsText(mediaInfo);
} }
if (audioChannels == null) if (audioChannels == null || audioChannels == 0.0m)
{ {
audioChannels = FormatAudioChannelsFromAudioChannels(mediaInfo); audioChannels = FormatAudioChannelsFromAudioChannels(mediaInfo);
} }
@ -550,6 +550,12 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
return audioChannelsContainer - 1 + 0.1m; return audioChannelsContainer - 1 + 0.1m;
} }
// FLAC 6 channels is likely 5.1
if (audioFormat.ContainsIgnoreCase("FLAC") && audioChannelsContainer == 6)
{
return 5.1m;
}
if (mediaInfo.SchemaRevision > 5) if (mediaInfo.SchemaRevision > 5)
{ {
return audioChannelsStream > 0 ? audioChannelsStream : audioChannelsContainer; return audioChannelsStream > 0 ? audioChannelsStream : audioChannelsContainer;