Merge branch 'master' into keyframe_extraction_v1

# Conflicts:
#	Jellyfin.Api/Controllers/DynamicHlsController.cs
#	MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
#	MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

1 files changed, 81 insertions, 0 deletions

diff --git a/tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeResultNormalizerTests.cs b/tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeResultNormalizerTests.cs
index d0d472e4d..0fc8724b6 100644
--- a/tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeResultNormalizerTests.cs
+++ b/tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeResultNormalizerTests.cs
@@ -5,8 +5,10 @@ using System.Text.Json;
 using Jellyfin.Extensions.Json;
 using MediaBrowser.MediaEncoding.Probing;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.MediaInfo;
 using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
 using Xunit;
 
 namespace Jellyfin.MediaEncoding.Tests.Probing
@@ -16,6 +18,19 @@ namespace Jellyfin.MediaEncoding.Tests.Probing
         private readonly JsonSerializerOptions _jsonOptions = JsonDefaults.Options;
         private readonly ProbeResultNormalizer _probeResultNormalizer = new ProbeResultNormalizer(new NullLogger<EncoderValidatorTests>(), null);
 
+        [Theory]
+        [InlineData("2997/125", 23.976f)]
+        [InlineData("1/50", 0.02f)]
+        [InlineData("25/1", 25f)]
+        [InlineData("120/1", 120f)]
+        [InlineData("1704753000/71073479", 23.98578237601117f)]
+        [InlineData("0/0", null)]
+        [InlineData("1/1000", 0.001f)]
+        [InlineData("1/90000", 1.1111111E-05f)]
+        [InlineData("1/48000", 2.0833333E-05f)]
+        public void GetFrameRate_Success(string value, float? expected)
+            => Assert.Equal(expected, ProbeResultNormalizer.GetFrameRate(value));
+
         [Fact]
         public void GetMediaInfo_MetaData_Success()
         {
@@ -56,6 +71,72 @@ namespace Jellyfin.MediaEncoding.Tests.Probing
         }
 
         [Fact]
+        public void GetMediaInfo_Mp4MetaData_Success()
+        {
+            var bytes = File.ReadAllBytes("Test Data/Probing/video_mp4_metadata.json");
+            var internalMediaInfoResult = JsonSerializer.Deserialize<InternalMediaInfoResult>(bytes, _jsonOptions);
+
+            // subtitle handling requires a localization object, set a mock to return the input string
+            var mockLocalization = new Mock<ILocalizationManager>();
+            mockLocalization.Setup(x => x.GetLocalizedString(It.IsAny<string>())).Returns<string>(x => x);
+            ProbeResultNormalizer localizedProbeResultNormalizer = new ProbeResultNormalizer(new NullLogger<EncoderValidatorTests>(), mockLocalization.Object);
+
+            MediaInfo res = localizedProbeResultNormalizer.GetMediaInfo(internalMediaInfoResult, VideoType.VideoFile, false, "Test Data/Probing/video_mp4_metadata.mkv", MediaProtocol.File);
+
+            // [Video, Audio (Main), Audio (Commentary), Subtitle (Main, Spanish), Subtitle (Main, English), Subtitle (Commentary)
+            Assert.Equal(6, res.MediaStreams.Count);
+
+            Assert.NotNull(res.VideoStream);
+            Assert.Equal(res.MediaStreams[0], res.VideoStream);
+            Assert.Equal(0, res.VideoStream.Index);
+            Assert.Equal("h264", res.VideoStream.Codec);
+            Assert.Equal("High", res.VideoStream.Profile);
+            Assert.Equal(MediaStreamType.Video, res.VideoStream.Type);
+            Assert.Equal(358, res.VideoStream.Height);
+            Assert.Equal(720, res.VideoStream.Width);
+            Assert.Equal("2.40:1", res.VideoStream.AspectRatio);
+            Assert.Equal("yuv420p", res.VideoStream.PixelFormat);
+            Assert.Equal(31d, res.VideoStream.Level);
+            Assert.Equal(1, res.VideoStream.RefFrames);
+            Assert.True(res.VideoStream.IsAVC);
+            Assert.Equal(120f, res.VideoStream.RealFrameRate);
+            Assert.Equal("1/90000", res.VideoStream.TimeBase);
+            Assert.Equal(1147365, res.VideoStream.BitRate);
+            Assert.Equal(8, res.VideoStream.BitDepth);
+            Assert.True(res.VideoStream.IsDefault);
+            Assert.Equal("und", res.VideoStream.Language);
+
+            Assert.Equal(MediaStreamType.Audio, res.MediaStreams[1].Type);
+            Assert.Equal("aac", res.MediaStreams[1].Codec);
+            Assert.Equal(7, res.MediaStreams[1].Channels);
+            Assert.True(res.MediaStreams[1].IsDefault);
+            Assert.Equal("eng", res.MediaStreams[1].Language);
+            Assert.Equal("Surround 6.1", res.MediaStreams[1].Title);
+
+            Assert.Equal(MediaStreamType.Audio, res.MediaStreams[2].Type);
+            Assert.Equal("aac", res.MediaStreams[2].Codec);
+            Assert.Equal(2, res.MediaStreams[2].Channels);
+            Assert.False(res.MediaStreams[2].IsDefault);
+            Assert.Equal("eng", res.MediaStreams[2].Language);
+            Assert.Equal("Commentary", res.MediaStreams[2].Title);
+
+            Assert.Equal("spa", res.MediaStreams[3].Language);
+            Assert.Equal(MediaStreamType.Subtitle, res.MediaStreams[3].Type);
+            Assert.Equal("DVDSUB", res.MediaStreams[3].Codec);
+            Assert.Null(res.MediaStreams[3].Title);
+
+            Assert.Equal("eng", res.MediaStreams[4].Language);
+            Assert.Equal(MediaStreamType.Subtitle, res.MediaStreams[4].Type);
+            Assert.Equal("mov_text", res.MediaStreams[4].Codec);
+            Assert.Null(res.MediaStreams[4].Title);
+
+            Assert.Equal("eng", res.MediaStreams[5].Language);
+            Assert.Equal(MediaStreamType.Subtitle, res.MediaStreams[5].Type);
+            Assert.Equal("mov_text", res.MediaStreams[5].Codec);
+            Assert.Equal("Commentary", res.MediaStreams[5].Title);
+        }
+
+        [Fact]
         public void GetMediaInfo_MusicVideo_Success()
         {
             var bytes = File.ReadAllBytes("Test Data/Probing/music_video_metadata.json");