Răsfoiți Sursa

Backport pull request #8212 from jellyfin/release-10.8.z

Add resolution text for 384 sized video

Original-merge: 7ffdde9a0b88f543a84fa8a3fa7487cbe8dda8b4

Merged-by: Cody Robibero <cody@robibe.ro>

Backported-by: Joshua Boniface <joshua@boniface.me>
SenorSmartyPants 2 ani în urmă
părinte
comite
de9a350bad

+ 4 - 0
MediaBrowser.Model/Entities/MediaStream.cs

@@ -594,6 +594,10 @@ namespace MediaBrowser.Model.Entities
                 <= 426 when Height <= 240 => IsInterlaced ? "240i" : "240p",
                 // 640x360 (16:9 square pixel format)
                 <= 640 when Height <= 360 => IsInterlaced ? "360i" : "360p",
+                // 682x384 (16:9 square pixel format)
+                <= 682 when Height <= 384 => IsInterlaced ? "384i" : "384p",
+                // 720x404 (16:9 square pixel format)
+                <= 720 when Height <= 404 => IsInterlaced ? "404i" : "404p",
                 // 854x480 (16:9 square pixel format)
                 <= 854 when Height <= 480 => IsInterlaced ? "480i" : "480p",
                 // 960x544 (16:9 square pixel format)

+ 3 - 3
tests/Jellyfin.Model.Tests/Entities/MediaStreamTests.cs

@@ -127,14 +127,14 @@ namespace Jellyfin.Model.Tests.Entities
         [InlineData(2560, 1080, true, "1080i")]
         [InlineData(4096, 3072, false, "4K")]
         [InlineData(8192, 6144, false, "8K")]
-        [InlineData(512, 384, false, "480p")]
+        [InlineData(512, 384, false, "384p")]
         [InlineData(576, 336, false, "360p")]
         [InlineData(576, 336, true, "360i")]
         [InlineData(624, 352, false, "360p")]
         [InlineData(640, 352, false, "360p")]
         [InlineData(640, 480, false, "480p")]
-        [InlineData(704, 396, false, "480p")]
-        [InlineData(720, 404, false, "480p")]
+        [InlineData(704, 396, false, "404p")]
+        [InlineData(720, 404, false, "404p")]
         [InlineData(720, 480, false, "480p")]
         [InlineData(720, 576, false, "576p")]
         [InlineData(768, 576, false, "576p")]