From d33bed6a36837a760ae0bc5edae9599d4e1139b2 Mon Sep 17 00:00:00 2001 From: ta264 Date: Tue, 9 Nov 2021 21:03:33 +0000 Subject: [PATCH] Fixed: Null reference error getting video file info --- src/NzbDrone.Common/Composition/AssemblyLoader.cs | 4 ---- src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs | 4 ++-- src/NzbDrone.Core/MediaFiles/MovieImport/DetectSample.cs | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/NzbDrone.Common/Composition/AssemblyLoader.cs b/src/NzbDrone.Common/Composition/AssemblyLoader.cs index 4e8eee8dc1..b8f0629b02 100644 --- a/src/NzbDrone.Common/Composition/AssemblyLoader.cs +++ b/src/NzbDrone.Common/Composition/AssemblyLoader.cs @@ -75,10 +75,6 @@ private static IntPtr LoadNativeLib(string libraryName, Assembly assembly, DllIm { mappedName = "libsqlite3.so.0"; } - else if (libraryName == "mediainfo") - { - mappedName = "libmediainfo.so.0"; - } } return NativeLibrary.Load(mappedName, assembly, dllImportSearchPath); diff --git a/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs b/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs index 1bca63e546..2eaebf41c8 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs @@ -77,7 +77,7 @@ public MediaInfoModel GetMediaInfo(string filename) VideoProfile = analysis.PrimaryVideoStream?.Profile, VideoBitrate = analysis.PrimaryVideoStream?.BitRate ?? 0, VideoMultiViewCount = 1, - VideoBitDepth = GetPixelFormat(analysis.PrimaryVideoStream?.PixelFormat).Components.Min(x => x.BitDepth), + VideoBitDepth = GetPixelFormat(analysis.PrimaryVideoStream?.PixelFormat)?.Components.Min(x => x.BitDepth) ?? 8, VideoColourPrimaries = analysis.PrimaryVideoStream?.ColorPrimaries, VideoTransferCharacteristics = analysis.PrimaryVideoStream?.ColorTransfer, DoviConfigurationRecord = analysis.PrimaryVideoStream?.SideDataList?.Find(x => x.GetType().Name == nameof(DoviConfigurationRecordSideData)) as DoviConfigurationRecordSideData, @@ -87,7 +87,7 @@ public MediaInfoModel GetMediaInfo(string filename) AudioCodecID = analysis.PrimaryAudioStream?.CodecTagString, AudioProfile = analysis.PrimaryAudioStream?.Profile, AudioBitrate = analysis.PrimaryAudioStream?.BitRate ?? 0, - RunTime = GetBestRuntime(analysis.PrimaryAudioStream?.Duration, analysis.PrimaryVideoStream.Duration, analysis.Format.Duration), + RunTime = GetBestRuntime(analysis.PrimaryAudioStream?.Duration, analysis.PrimaryVideoStream?.Duration, analysis.Format.Duration), AudioStreamCount = analysis.AudioStreams.Count, AudioChannels = analysis.PrimaryAudioStream?.Channels ?? 0, AudioChannelPositions = analysis.PrimaryAudioStream?.ChannelLayout, diff --git a/src/NzbDrone.Core/MediaFiles/MovieImport/DetectSample.cs b/src/NzbDrone.Core/MediaFiles/MovieImport/DetectSample.cs index 9a948af1ff..1caf7da6b7 100644 --- a/src/NzbDrone.Core/MediaFiles/MovieImport/DetectSample.cs +++ b/src/NzbDrone.Core/MediaFiles/MovieImport/DetectSample.cs @@ -53,7 +53,7 @@ public DetectSampleResult IsSample(Movie movie, string path) if (!runTime.HasValue) { - _logger.Error("Failed to get runtime from the file, make sure mediainfo is available"); + _logger.Error("Failed to get runtime from the file, make sure ffprobe is available"); return DetectSampleResult.Indeterminate; }