From b8e5afbc10150c852ce80a960bb902b0e08c30fe Mon Sep 17 00:00:00 2001 From: tallbl0nde <40382856+tallbl0nde@users.noreply.github.com> Date: Fri, 21 Jul 2023 19:16:01 +0930 Subject: Enable recursive query in BaseFolderImageProvider Fixes album art not being extracted for multi-disc albums --- CONTRIBUTORS.md | 1 + 1 file changed, 1 insertion(+) (limited to 'CONTRIBUTORS.md') diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index dfb61df0a..d5a87d269 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -166,6 +166,7 @@ - [RealGreenDragon](https://github.com/RealGreenDragon) - [ipitio](https://github.com/ipitio) - [TheTyrius](https://github.com/TheTyrius) + - [tallbl0nde](https://github.com/tallbl0nde) # Emby Contributors -- cgit v1.2.3 From f669d4a72e478f05c2b69d14ee6058690a0b9fbd Mon Sep 17 00:00:00 2001 From: sleepycatcoding <131554884+sleepycatcoding@users.noreply.github.com> Date: Sun, 23 Apr 2023 14:33:06 +0300 Subject: Add contributor --- CONTRIBUTORS.md | 1 + 1 file changed, 1 insertion(+) (limited to 'CONTRIBUTORS.md') diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index d5a87d269..b7e777817 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -167,6 +167,7 @@ - [ipitio](https://github.com/ipitio) - [TheTyrius](https://github.com/TheTyrius) - [tallbl0nde](https://github.com/tallbl0nde) + - [sleepycatcoding](https://github.com/sleepycatcoding) # Emby Contributors -- cgit v1.2.3 From 8dc58e8f04ca891aa8e515c369f14ecbb21d2191 Mon Sep 17 00:00:00 2001 From: null <9310d27e@gmail.com> Date: Sun, 20 Aug 2023 21:18:55 +0400 Subject: Added handling of FFmpeg:probesize variable --- CONTRIBUTORS.md | 1 + MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) (limited to 'CONTRIBUTORS.md') diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index b7e777817..e3af12a49 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -238,3 +238,4 @@ - [Jakob Kukla](https://github.com/jakobkukla) - [Utku Ă–zdemir](https://github.com/utkuozdemir) - [JPUC1143](https://github.com/Jpuc1143/) + - [0x25CBFC4F](https://github.com/0x25CBFC4F) diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index d61430b0b..f8d2dd40f 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -5678,7 +5678,6 @@ namespace MediaBrowser.Controller.MediaEncoding // Apply -analyzeduration as per the environment variable, // otherwise ffmpeg will break on certain files due to default value is 0. - // The default value of -probesize is more than enough, so leave it as is. var ffmpegAnalyzeDuration = _config.GetFFmpegAnalyzeDuration() ?? string.Empty; if (state.MediaSource.AnalyzeDurationMs > 0) @@ -5697,6 +5696,22 @@ namespace MediaBrowser.Controller.MediaEncoding inputModifier = inputModifier.Trim(); + // Apply -probesize if configured + var probeSizeArgument = string.Empty; + var ffmpegProbeSize = _config.GetFFmpegProbeSize(); + + if (!string.IsNullOrEmpty(ffmpegProbeSize)) + { + probeSizeArgument = $"-probesize {probeSizeArgument}"; + } + + if (!string.IsNullOrEmpty(probeSizeArgument)) + { + inputModifier += $" {probeSizeArgument}"; + } + + inputModifier = inputModifier.Trim(); + var userAgentParam = GetUserAgentParam(state); if (!string.IsNullOrEmpty(userAgentParam)) -- cgit v1.2.3