From de9a350bad7d8f9714ad4db88e7b5e3219b1f514 Mon Sep 17 00:00:00 2001 From: SenorSmartyPants Date: Sat, 13 Aug 2022 21:46:34 -0400 Subject: [PATCH] Backport pull request #8212 from jellyfin/release-10.8.z Add resolution text for 384 sized video Original-merge: 7ffdde9a0b88f543a84fa8a3fa7487cbe8dda8b4 Merged-by: Cody Robibero Backported-by: Joshua Boniface --- MediaBrowser.Model/Entities/MediaStream.cs | 4 ++++ tests/Jellyfin.Model.Tests/Entities/MediaStreamTests.cs | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs index ce21707938..ae8f3b0edf 100644 --- a/MediaBrowser.Model/Entities/MediaStream.cs +++ b/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) diff --git a/tests/Jellyfin.Model.Tests/Entities/MediaStreamTests.cs b/tests/Jellyfin.Model.Tests/Entities/MediaStreamTests.cs index 7c8a90605b..80c38affe1 100644 --- a/tests/Jellyfin.Model.Tests/Entities/MediaStreamTests.cs +++ b/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")]