mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed: Don't workaround DTS if audioChannels invalid

This commit is contained in:
Qstick 2020-11-27 01:10:09 -05:00 committed by Mark McDowall
parent b8b09cd0ce
commit 9180e7d6fd
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -511,26 +511,29 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
private static decimal? FormatAudioChannelsFromAudioChannels(MediaInfoModel mediaInfo) private static decimal? FormatAudioChannelsFromAudioChannels(MediaInfoModel mediaInfo)
{ {
var audioChannels = mediaInfo.AudioChannelsContainer; var audioChannelsContainer = mediaInfo.AudioChannelsContainer;
var audioChannelsStream = mediaInfo.AudioChannelsStream; var audioChannelsStream = mediaInfo.AudioChannelsStream;
var audioFormat = (mediaInfo.AudioFormat ?? string.Empty).Trim().Split(new[] { " / " }, StringSplitOptions.RemoveEmptyEntries); var audioFormat = (mediaInfo.AudioFormat ?? string.Empty).Trim().Split(new[] { " / " }, StringSplitOptions.RemoveEmptyEntries);
var splitAdditionalFeatures = (mediaInfo.AudioAdditionalFeatures ?? string.Empty).Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries); var splitAdditionalFeatures = (mediaInfo.AudioAdditionalFeatures ?? string.Empty).Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
// Workaround https://github.com/MediaArea/MediaInfo/issues/299 for DTS-X Audio // Workaround https://github.com/MediaArea/MediaInfo/issues/299 for DTS-X Audio
if (audioFormat.ContainsIgnoreCase("DTS") && splitAdditionalFeatures.ContainsIgnoreCase("XLL") && splitAdditionalFeatures.ContainsIgnoreCase("X")) if (audioFormat.ContainsIgnoreCase("DTS") &&
splitAdditionalFeatures.ContainsIgnoreCase("XLL") &&
splitAdditionalFeatures.ContainsIgnoreCase("X") &&
audioChannelsContainer > 0)
{ {
return audioChannels - 1 + 0.1m; return audioChannelsContainer - 1 + 0.1m;
} }
if (mediaInfo.SchemaRevision > 5) if (mediaInfo.SchemaRevision > 5)
{ {
return audioChannelsStream > 0 ? audioChannelsStream : audioChannels; return audioChannelsStream > 0 ? audioChannelsStream : audioChannelsContainer;
} }
if (mediaInfo.SchemaRevision >= 3) if (mediaInfo.SchemaRevision >= 3)
{ {
return audioChannels; return audioChannelsContainer;
} }
return null; return null;