diff --git a/frontend/src/Settings/MediaManagement/Naming/NamingModal.js b/frontend/src/Settings/MediaManagement/Naming/NamingModal.js index 9545ec62f..f5a7ca819 100644 --- a/frontend/src/Settings/MediaManagement/Naming/NamingModal.js +++ b/frontend/src/Settings/MediaManagement/Naming/NamingModal.js @@ -70,7 +70,8 @@ const mediaInfoTokens = [ { token: '{MediaInfo VideoCodec}', example: 'x264' }, { token: '{MediaInfo VideoBitDepth}', example: '10' }, { token: '{MediaInfo VideoDynamicRange}', example: 'HDR' }, - { token: '{MediaInfo VideoDynamicRangeType}', example: 'DV HDR10' } + { token: '{MediaInfo VideoDynamicRangeType}', example: 'DV HDR10' }, + { token: '{MediaInfo 3D}', example: '3D' } ]; const releaseGroupTokens = [ diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/FileNameBuilderFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/FileNameBuilderFixture.cs index 18ef0c2ff..de0137207 100644 --- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/FileNameBuilderFixture.cs +++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/FileNameBuilderFixture.cs @@ -425,7 +425,6 @@ public void should_exclude_english_in_mediainfo_audio_language() .Should().Be("South.Park.H264.DTS.[EN+ES+IT]"); } - [Ignore("not currently supported")] [Test] public void should_format_mediainfo_3d_properly() { diff --git a/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs b/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs index 4d48a70e0..01e18f5c0 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs @@ -75,7 +75,7 @@ public MediaInfoModel GetMediaInfo(string filename) mediaInfoModel.VideoCodecID = analysis.PrimaryVideoStream?.CodecTagString; mediaInfoModel.VideoProfile = analysis.PrimaryVideoStream?.Profile; mediaInfoModel.VideoBitrate = analysis.PrimaryVideoStream?.BitRate ?? 0; - mediaInfoModel.VideoMultiViewCount = 1; + mediaInfoModel.VideoMultiViewCount = analysis.PrimaryVideoStream?.Tags.ContainsKey("stereo_mode") ?? false ? 2 : 1; mediaInfoModel.VideoBitDepth = GetPixelFormat(analysis.PrimaryVideoStream?.PixelFormat)?.Components.Min(x => x.BitDepth) ?? 8; mediaInfoModel.VideoColourPrimaries = analysis.PrimaryVideoStream?.ColorPrimaries; mediaInfoModel.VideoTransferCharacteristics = analysis.PrimaryVideoStream?.ColorTransfer;