The Free Software Media System - Server Backend & API
Backport pull request #15807 from jellyfin/release-10.11.z
gnattu88acd51ee2b6
diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.csindex 1823496bf1..570ef9ee27 100644--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs@@ -300,9 +300,12 @@ namespace MediaBrowser.MediaEncoding.Probing// Handle WebMelse if (string.Equals(splitFormat[i], "webm", StringComparison.OrdinalIgnoreCase)){- // Limit WebM to supported codecs- if (mediaStreams.Any(stream => (stream.Type == MediaStreamType.Video && !_webmVideoCodecs.Contains(stream.Codec, StringComparison.OrdinalIgnoreCase))- || (stream.Type == MediaStreamType.Audio && !_webmAudioCodecs.Contains(stream.Codec, StringComparison.OrdinalIgnoreCase))))+ // Limit WebM to supported stream types and codecs.+ // FFprobe can report "matroska,webm" for Matroska-like containers, so only keep "webm" if all streams are WebM-compatible.+ // Any stream that is not video nor audio is not supported in WebM and should disqualify the webm container probe result.+ if (mediaStreams.Any(stream => stream.Type is not MediaStreamType.Video and not MediaStreamType.Audio)+ || mediaStreams.Any(stream => (stream.Type == MediaStreamType.Video && !_webmVideoCodecs.Contains(stream.Codec, StringComparison.OrdinalIgnoreCase))+ || (stream.Type == MediaStreamType.Audio && !_webmAudioCodecs.Contains(stream.Codec, StringComparison.OrdinalIgnoreCase)))){splitFormat[i] = string.Empty;}diff --git a/tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeResultNormalizerTests.cs b/tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeResultNormalizerTests.csindex 94710a0957..8a2f84734e 100644--- a/tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeResultNormalizerTests.cs+++ b/tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeResultNormalizerTests.cs@@ -195,6 +195,18 @@ namespace Jellyfin.MediaEncoding.Tests.ProbingAssert.False(res.MediaStreams[0].IsAVC);}+ [Fact]+ public void GetMediaInfo_WebM_Like_Mkv()+ {+ var bytes = File.ReadAllBytes("Test Data/Probing/video_web_like_mkv_with_subtitle.json");+ var internalMediaInfoResult = JsonSerializer.Deserialize<InternalMediaInfoResult>(bytes, _jsonOptions);++ MediaInfo res = _probeResultNormalizer.GetMediaInfo(internalMediaInfoResult, VideoType.VideoFile, false, "Test Data/Probing/video_metadata.mkv", MediaProtocol.File);++ Assert.Equal("mkv", res.Container);+ Assert.Equal(3, res.MediaStreams.Count);+ }+[Fact]public void GetMediaInfo_ProgressiveVideoNoFieldOrder_Success(){diff --git a/tests/Jellyfin.MediaEncoding.Tests/Test Data/Probing/video_web_like_mkv_with_subtitle.json b/tests/Jellyfin.MediaEncoding.Tests/Test Data/Probing/video_web_like_mkv_with_subtitle.jsonnew file mode 100644index 0000000000..4f52dd90dc--- /dev/null+++ b/tests/Jellyfin.MediaEncoding.Tests/Test Data/Probing/video_web_like_mkv_with_subtitle.json@@ -0,0 +1,137 @@+{+ "streams": [+ {+ "index": 0,+ "codec_name": "vp8",+ "codec_long_name": "On2 VP8",+ "profile": "1",+ "codec_type": "video",+ "codec_tag_string": "[0][0][0][0]",+ "codec_tag": "0x0000",+ "width": 540,+ "height": 360,+ "coded_width": 540,+ "coded_height": 360,+ "closed_captions": 0,+ "film_grain": 0,+ "has_b_frames": 0,+ "sample_aspect_ratio": "1:1",+ "display_aspect_ratio": "3:2",+ "pix_fmt": "yuv420p",+ "level": -99,+ "field_order": "progressive",+ "refs": 1,+ "r_frame_rate": "2997/125",+ "avg_frame_rate": "2997/125",+ "time_base": "1/1000",+ "start_pts": 0,+ "start_time": "0.000000",+ "disposition": {+ "default": 1,+ "dub": 0,+ "original": 0,+ "comment": 0,+ "lyrics": 0,+ "karaoke": 0,+ "forced": 0,+ "hearing_impaired": 0,+ "visual_impaired": 0,+ "clean_effects": 0,+ "attached_pic": 0,+ "timed_thumbnails": 0,+ "captions": 0,+ "descriptions": 0,+ "metadata": 0,+ "dependent": 0,+ "still_image": 0+ },+ "tags": {+ "language": "eng"+ }+ },+ {+ "index": 1,+ "codec_name": "vorbis",+ "codec_long_name": "Vorbis",+ "codec_type": "audio",+ "codec_tag_string": "[0][0][0][0]",+ "codec_tag": "0x0000",+ "sample_fmt": "fltp",+ "sample_rate": "44100",+ "channels": 2,+ "channel_layout": "stereo",+ "bits_per_sample": 0,+ "r_frame_rate": "0/0",+ "avg_frame_rate": "0/0",+ "time_base": "1/1000",+ "start_pts": 0,+ "start_time": "0.000000",+ "duration": "117.707000",+ "bit_rate": "127998",+ "disposition": {+ "default": 1,+ "dub": 0,+ "original": 0,+ "comment": 0,+ "lyrics": 0,+ "karaoke": 0,+ "forced": 0,+ "hearing_impaired": 0,+ "visual_impaired": 0,+ "clean_effects": 0,+ "attached_pic": 0,+ "timed_thumbnails": 0,+ "captions": 0,+ "descriptions": 0,+ "metadata": 0,+ "dependent": 0,+ "still_image": 0+ },+ "tags": {+ "language": "eng"+ }+ },+ {+ "index": 2,+ "codec_name": "subrip",+ "codec_long_name": "SubRip subtitle",+ "codec_type": "subtitle",+ "codec_tag_string": "[0][0][0][0]",+ "codec_tag": "0x0000",+ "disposition": {+ "default": 0,+ "dub": 0,+ "original": 0,+ "comment": 0,+ "lyrics": 0,+ "karaoke": 0,+ "forced": 0,+ "hearing_impaired": 0,+ "visual_impaired": 0,+ "clean_effects": 0,+ "attached_pic": 0,+ "timed_thumbnails": 0,+ "captions": 0,+ "descriptions": 0,+ "metadata": 0,+ "dependent": 0,+ "still_image": 0+ },+ "tags": {+ "language": "eng"+ }+ }+ ],+ "format": {+ "filename": "sample.mkv",+ "nb_streams": 3,+ "nb_programs": 0,+ "format_name": "matroska,webm",+ "format_long_name": "Matroska / WebM",+ "start_time": "0.000000",+ "duration": "117.700914",+ "size": "8566268",+ "bit_rate": "582239",+ "probe_score": 100+ }+}