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

Fixed: Null reference error getting video file info

This commit is contained in:
ta264 2021-11-09 21:03:33 +00:00
parent 3acc6a3f9d
commit d33bed6a36
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/NzbDrone.Common/Composition/AssemblyLoader.cs
View File

@ -75,10 +75,6 @@ namespace NzbDrone.Common.Composition
{ {
mappedName = "libsqlite3.so.0"; mappedName = "libsqlite3.so.0";
} }
else if (libraryName == "mediainfo")
{
mappedName = "libmediainfo.so.0";
}
} }
return NativeLibrary.Load(mappedName, assembly, dllImportSearchPath); return NativeLibrary.Load(mappedName, assembly, dllImportSearchPath);

4
src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs
View File

@ -77,7 +77,7 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
VideoProfile = analysis.PrimaryVideoStream?.Profile, VideoProfile = analysis.PrimaryVideoStream?.Profile,
VideoBitrate = analysis.PrimaryVideoStream?.BitRate ?? 0, VideoBitrate = analysis.PrimaryVideoStream?.BitRate ?? 0,
VideoMultiViewCount = 1, 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, VideoColourPrimaries = analysis.PrimaryVideoStream?.ColorPrimaries,
VideoTransferCharacteristics = analysis.PrimaryVideoStream?.ColorTransfer, VideoTransferCharacteristics = analysis.PrimaryVideoStream?.ColorTransfer,
DoviConfigurationRecord = analysis.PrimaryVideoStream?.SideDataList?.Find(x => x.GetType().Name == nameof(DoviConfigurationRecordSideData)) as DoviConfigurationRecordSideData, DoviConfigurationRecord = analysis.PrimaryVideoStream?.SideDataList?.Find(x => x.GetType().Name == nameof(DoviConfigurationRecordSideData)) as DoviConfigurationRecordSideData,
@ -87,7 +87,7 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
AudioCodecID = analysis.PrimaryAudioStream?.CodecTagString, AudioCodecID = analysis.PrimaryAudioStream?.CodecTagString,
AudioProfile = analysis.PrimaryAudioStream?.Profile, AudioProfile = analysis.PrimaryAudioStream?.Profile,
AudioBitrate = analysis.PrimaryAudioStream?.BitRate ?? 0, 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, AudioStreamCount = analysis.AudioStreams.Count,
AudioChannels = analysis.PrimaryAudioStream?.Channels ?? 0, AudioChannels = analysis.PrimaryAudioStream?.Channels ?? 0,
AudioChannelPositions = analysis.PrimaryAudioStream?.ChannelLayout, AudioChannelPositions = analysis.PrimaryAudioStream?.ChannelLayout,

2
src/NzbDrone.Core/MediaFiles/MovieImport/DetectSample.cs
View File

@ -53,7 +53,7 @@ namespace NzbDrone.Core.MediaFiles.MovieImport
if (!runTime.HasValue) 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; return DetectSampleResult.Indeterminate;
} }