From b61541b6f749a189a69011f0888496fd7fcd99a7 Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Thu, 24 Dec 2020 01:32:23 +0800 Subject: fix some profiles for H264 AMF encoder --- .../MediaEncoding/EncodingHelper.cs | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs') diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 73ede7c5a..6667c1c3b 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -1131,8 +1131,8 @@ namespace MediaBrowser.Controller.MediaEncoding profile = Regex.Replace(profile, @"\s+", string.Empty); // We only transcode to HEVC 8-bit for now, force Main Profile. - if (profile.Contains("main 10", StringComparison.OrdinalIgnoreCase) - || profile.Contains("main still", StringComparison.OrdinalIgnoreCase)) + if (profile.Contains("main10", StringComparison.OrdinalIgnoreCase) + || profile.Contains("mainstill", StringComparison.OrdinalIgnoreCase)) { profile = "main"; } @@ -1145,7 +1145,7 @@ namespace MediaBrowser.Controller.MediaEncoding // Only libx264 support encoding H264 High 10 Profile, otherwise force High Profile. if (!string.Equals(videoEncoder, "libx264", StringComparison.OrdinalIgnoreCase) - && profile.Contains("high 10", StringComparison.OrdinalIgnoreCase)) + && profile.Contains("high10", StringComparison.OrdinalIgnoreCase)) { profile = "high"; } @@ -1177,9 +1177,21 @@ namespace MediaBrowser.Controller.MediaEncoding profile = "high"; } + if (string.Equals(videoEncoder, "h264_amf", StringComparison.OrdinalIgnoreCase) + && profile.Contains("constrainedbaseline", StringComparison.OrdinalIgnoreCase)) + { + profile = "constrained_baseline"; + } + + if (string.Equals(videoEncoder, "h264_amf", StringComparison.OrdinalIgnoreCase) + && profile.Contains("constrainedhigh", StringComparison.OrdinalIgnoreCase)) + { + profile = "constrained_high"; + } + // Currently hevc_amf only support encoding HEVC Main Profile, otherwise force Main Profile. if (string.Equals(videoEncoder, "hevc_amf", StringComparison.OrdinalIgnoreCase) - && profile.Contains("main 10", StringComparison.OrdinalIgnoreCase)) + && profile.Contains("main10", StringComparison.OrdinalIgnoreCase)) { profile = "main"; } -- cgit v1.2.3 From bc6ec08322a6d9111849dd4661bdda3746347835 Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Thu, 24 Dec 2020 19:41:02 +0800 Subject: avoid transcoding to 3ch audio for HLS streaming --- MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs') diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 6667c1c3b..17201551a 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -1722,6 +1722,16 @@ namespace MediaBrowser.Controller.MediaEncoding : transcoderChannelLimit.Value; } + // Avoid transcoding to audio channels other than 1ch, 2ch, 6ch (5.1 layout) and 8ch (7.1 layout). + // https://developer.apple.com/documentation/http_live_streaming/hls_authoring_specification_for_apple_devices + if (isTranscodingAudio + && resultChannels.HasValue + && resultChannels.Value > 2 + && resultChannels.Value < 6) + { + resultChannels = 2; + } + return resultChannels; } -- cgit v1.2.3 From ae1187042af7bc9a144d184a31017b6bd32eefcd Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Thu, 24 Dec 2020 20:06:55 +0800 Subject: also avoid 7ch transcoding --- MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs') diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 17201551a..29978a56c 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -1726,8 +1726,7 @@ namespace MediaBrowser.Controller.MediaEncoding // https://developer.apple.com/documentation/http_live_streaming/hls_authoring_specification_for_apple_devices if (isTranscodingAudio && resultChannels.HasValue - && resultChannels.Value > 2 - && resultChannels.Value < 6) + && (resultChannels.Value > 2 && resultChannels.Value < 6 || resultChannels.Value == 7)) { resultChannels = 2; } -- cgit v1.2.3 From 470f40442cd6ecbcfe81888804bf4e6a04846aec Mon Sep 17 00:00:00 2001 From: Nyanmisaka Date: Sat, 26 Dec 2020 02:28:38 +0800 Subject: not apply to progressive playback --- MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 1 + 1 file changed, 1 insertion(+) (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs') diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 29978a56c..efab87a38 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -1725,6 +1725,7 @@ namespace MediaBrowser.Controller.MediaEncoding // Avoid transcoding to audio channels other than 1ch, 2ch, 6ch (5.1 layout) and 8ch (7.1 layout). // https://developer.apple.com/documentation/http_live_streaming/hls_authoring_specification_for_apple_devices if (isTranscodingAudio + && state.TranscodingType != TranscodingJobType.Progressive && resultChannels.HasValue && (resultChannels.Value > 2 && resultChannels.Value < 6 || resultChannels.Value == 7)) { -- cgit v1.2.3