Merge pull request #1100 from ploughpuff/rmprobeswitch

Finalise removal of --ffprobe switch
5 years ago · 605bf0e8c3
parent 89e2af6b57 b864e9da2a
commit 605bf0e8c3
11 changed files with 6 additions and 29 deletions
--- a/3
+++ b/3
@ -31,5 +31,4 @@ VOLUME /cache /config /media
 ENTRYPOINT dotnet /jellyfin/jellyfin.dll \
    --datadir /config \
    --cachedir /cache \
-    --ffmpeg /usr/local/bin/ffmpeg \
-    --ffprobe /usr/local/bin/ffprobe
+    --ffmpeg /usr/local/bin/ffmpeg
--- a/Dockerfile.arm
+++ b/Dockerfile.arm
@ -39,5 +39,4 @@ VOLUME /cache /config /media
 ENTRYPOINT dotnet /jellyfin/jellyfin.dll \
    --datadir /config \
    --cachedir /cache \
-    --ffmpeg /usr/bin/ffmpeg \
-    --ffprobe /usr/bin/ffprobe
+    --ffmpeg /usr/bin/ffmpeg
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@ -40,5 +40,4 @@ VOLUME /cache /config /media
 ENTRYPOINT dotnet /jellyfin/jellyfin.dll \
    --datadir /config \
    --cachedir /cache \
-    --ffmpeg /usr/bin/ffmpeg \
-    --ffprobe /usr/bin/ffprobe
+    --ffmpeg /usr/bin/ffmpeg
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@ -837,7 +837,6 @@ namespace Emby.Server.Implementations
                LoggerFactory,
                JsonSerializer,
                StartupOptions.FFmpegPath,
-                StartupOptions.FFprobePath,
                ServerConfigurationManager,
                FileSystemManager,
                () => SubtitleEncoder,
--- a/Emby.Server.Implementations/IStartupOptions.cs
+++ b/Emby.Server.Implementations/IStartupOptions.cs
@ -7,11 +7,6 @@ namespace Emby.Server.Implementations
        /// </summary>
        string FFmpegPath { get; }

-        /// <summary>
-        /// --ffprobe
-        /// </summary>
-        string FFprobePath { get; }
-
        /// <summary>
        /// --service
        /// </summary>
--- a/Jellyfin.Server/StartupOptions.cs
+++ b/Jellyfin.Server/StartupOptions.cs
@ -26,9 +26,6 @@ namespace Jellyfin.Server
        [Option("ffmpeg", Required = false, HelpText = "Path to external FFmpeg executable to use in place of default found in PATH.")]
        public string FFmpegPath { get; set; }

-        [Option("ffprobe", Required = false, HelpText = "(deprecated) Option has no effect and shall be removed in next release.")]
-        public string FFprobePath { get; set; }
-
        [Option("service", Required = false, HelpText = "Run as headless service.")]
        public bool IsService { get; set; }

--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@ -51,7 +51,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
        private readonly IProcessFactory _processFactory;
        private readonly int DefaultImageExtractionTimeoutMs;
        private readonly string StartupOptionFFmpegPath;
-        private readonly string StartupOptionFFprobePath;

        private readonly SemaphoreSlim _thumbnailResourcePool = new SemaphoreSlim(1, 1);
        private readonly List<ProcessWrapper> _runningProcesses = new List<ProcessWrapper>();
@ -60,7 +59,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
            ILoggerFactory loggerFactory,
            IJsonSerializer jsonSerializer,
            string startupOptionsFFmpegPath,
-            string startupOptionsFFprobePath,
            IServerConfigurationManager configurationManager,
            IFileSystem fileSystem,
            Func<ISubtitleEncoder> subtitleEncoder,
@ -71,7 +69,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
            _logger = loggerFactory.CreateLogger(nameof(MediaEncoder));
            _jsonSerializer = jsonSerializer;
            StartupOptionFFmpegPath = startupOptionsFFmpegPath;
-            StartupOptionFFprobePath = startupOptionsFFprobePath;
            ConfigurationManager = configurationManager;
            FileSystem = fileSystem;
            SubtitleEncoder = subtitleEncoder;
@ -86,12 +83,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
        /// </summary>
        public void SetFFmpegPath()
        {
-            // ToDo - Finalise removal of the --ffprobe switch
-            if (!string.IsNullOrEmpty(StartupOptionFFprobePath))
-            {
-                _logger.LogWarning("--ffprobe switch is deprecated and shall be removed in the next release");
-            }
-
            // 1) Custom path stored in config/encoding xml file under tag <EncoderAppPath> takes precedence
            if (!ValidatePath(ConfigurationManager.GetConfiguration<EncodingOptions>("encoding").EncoderAppPath, FFmpegLocation.Custom))
            {
--- a/deployment/debian-package-x64/pkg-src/conf/jellyfin
+++ b/deployment/debian-package-x64/pkg-src/conf/jellyfin
@ -23,7 +23,6 @@ JELLYFIN_RESTART_OPT="--restartpath=/usr/lib/jellyfin/restart.sh"

 # ffmpeg binary paths, overriding the system values
 JELLYFIN_FFMPEG_OPT="--ffmpeg=/usr/share/jellyfin-ffmpeg/ffmpeg"
-JELLYFIN_FFPROBE_OPT="--ffprobe=/usr/share/jellyfin-ffmpeg/ffprobe"

 # [OPTIONAL] run Jellyfin as a headless service
 #JELLYFIN_SERVICE_OPT="--service"
@ -38,4 +37,4 @@ JELLYFIN_FFPROBE_OPT="--ffprobe=/usr/share/jellyfin-ffmpeg/ffprobe"
 # Application username
 JELLYFIN_USER="jellyfin"
 # Full application command
-JELLYFIN_ARGS="$JELLYFIN_RESTART_OPT $JELLYFIN_FFMPEG_OPT $JELLYFIN_FFPROBE_OPT $JELLYFIN_SERVICE_OPT $JELLFIN_NOWEBAPP_OPT"
+JELLYFIN_ARGS="$JELLYFIN_RESTART_OPT $JELLYFIN_FFMPEG_OPT $JELLYFIN_SERVICE_OPT $JELLFIN_NOWEBAPP_OPT"
--- a/deployment/debian-package-x64/pkg-src/jellyfin.service
+++ b/deployment/debian-package-x64/pkg-src/jellyfin.service
@ -6,7 +6,7 @@ After = network.target
 Type = simple
 EnvironmentFile = /etc/default/jellyfin
 User = jellyfin
-ExecStart = /usr/bin/jellyfin ${JELLYFIN_RESTART_OPT} ${JELLYFIN_FFMPEG_OPT} ${JELLYFIN_FFPROBE_OPT} ${JELLYFIN_SERVICE_OPT} ${JELLYFIN_NOWEBAPP_OPT}
+ExecStart = /usr/bin/jellyfin ${JELLYFIN_RESTART_OPT} ${JELLYFIN_FFMPEG_OPT} ${JELLYFIN_SERVICE_OPT} ${JELLYFIN_NOWEBAPP_OPT}
 Restart = on-failure
 TimeoutSec = 15

--- a/deployment/fedora-package-x64/pkg-src/jellyfin.env
+++ b/deployment/fedora-package-x64/pkg-src/jellyfin.env
@ -25,7 +25,6 @@ JELLYFIN_RESTART_OPT="--restartpath=/usr/libexec/jellyfin/restart.sh"

 # [OPTIONAL] ffmpeg binary paths, overriding the UI-configured values
 #JELLYFIN_FFMPEG_OPT="--ffmpeg=/usr/bin/ffmpeg"
-#JELLYFIN_FFPROBE_OPT="--ffprobe=/usr/bin/ffprobe"

 # [OPTIONAL] run Jellyfin as a headless service
 #JELLYFIN_SERVICE_OPT="--service"
--- a/deployment/fedora-package-x64/pkg-src/jellyfin.service
+++ b/deployment/fedora-package-x64/pkg-src/jellyfin.service
@ -5,7 +5,7 @@ Description=Jellyfin is a free software media system that puts you in control of
 [Service]
 EnvironmentFile=/etc/sysconfig/jellyfin
 WorkingDirectory=/var/lib/jellyfin
-ExecStart=/usr/bin/jellyfin ${JELLYFIN_RESTART_OPT} ${JELLYFIN_FFMPEG_OPT} ${JELLYFIN_FFPROBE_OPT} ${JELLYFIN_SERVICE_OPT} ${JELLYFIN_NOWEBAPP_OPT}
+ExecStart=/usr/bin/jellyfin ${JELLYFIN_RESTART_OPT} ${JELLYFIN_FFMPEG_OPT} ${JELLYFIN_SERVICE_OPT} ${JELLYFIN_NOWEBAPP_OPT}
 TimeoutSec=15
 Restart=on-failure
 User=jellyfin