open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1100 from ploughpuff/rmprobeswitch

Browse Source 
Finalise removal of --ffprobe switch
pull/1103/head
Vasily 5 years ago committed by GitHub
parent 89e2af6b57 b864e9da2a
commit 605bf0e8c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File

3
Dockerfile
Unescape View File

@ -31,5 +31,4 @@ VOLUME /cache /config /media
ENTRYPOINT dotnet /jellyfin/jellyfin.dll \ ENTRYPOINT dotnet /jellyfin/jellyfin.dll \
--datadir /config \ --datadir /config \
--cachedir /cache \ --cachedir /cache \
--ffmpeg /usr/local/bin/ffmpeg \ --ffmpeg /usr/local/bin/ffmpeg
--ffprobe /usr/local/bin/ffprobe

3
Dockerfile.arm
Unescape View File

@ -39,5 +39,4 @@ VOLUME /cache /config /media
ENTRYPOINT dotnet /jellyfin/jellyfin.dll \ ENTRYPOINT dotnet /jellyfin/jellyfin.dll \
--datadir /config \ --datadir /config \
--cachedir /cache \ --cachedir /cache \
--ffmpeg /usr/bin/ffmpeg \ --ffmpeg /usr/bin/ffmpeg
--ffprobe /usr/bin/ffprobe

3
Dockerfile.arm64
Unescape View File

@ -40,5 +40,4 @@ VOLUME /cache /config /media
ENTRYPOINT dotnet /jellyfin/jellyfin.dll \ ENTRYPOINT dotnet /jellyfin/jellyfin.dll \
--datadir /config \ --datadir /config \
--cachedir /cache \ --cachedir /cache \
--ffmpeg /usr/bin/ffmpeg \ --ffmpeg /usr/bin/ffmpeg
--ffprobe /usr/bin/ffprobe

1
Emby.Server.Implementations/ApplicationHost.cs
Unescape View File

@ -837,7 +837,6 @@ namespace Emby.Server.Implementations
LoggerFactory, LoggerFactory,
JsonSerializer, JsonSerializer,
StartupOptions.FFmpegPath, StartupOptions.FFmpegPath,
StartupOptions.FFprobePath,
ServerConfigurationManager, ServerConfigurationManager,
FileSystemManager, FileSystemManager,
() => SubtitleEncoder, () => SubtitleEncoder,

5
Emby.Server.Implementations/IStartupOptions.cs
Unescape View File

@ -7,11 +7,6 @@ namespace Emby.Server.Implementations
/// </summary> /// </summary>
string FFmpegPath { get; } string FFmpegPath { get; }
/// <summary>
/// --ffprobe
/// </summary>
string FFprobePath { get; }
/// <summary> /// <summary>
/// --service /// --service
/// </summary> /// </summary>

3
Jellyfin.Server/StartupOptions.cs
Unescape View File

@ -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.")] [Option("ffmpeg", Required = false, HelpText = "Path to external FFmpeg executable to use in place of default found in PATH.")]
public string FFmpegPath { get; set; } 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.")] [Option("service", Required = false, HelpText = "Run as headless service.")]
public bool IsService { get; set; } public bool IsService { get; set; }

9
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
Unescape View File

@ -51,7 +51,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
private readonly IProcessFactory _processFactory; private readonly IProcessFactory _processFactory;
private readonly int DefaultImageExtractionTimeoutMs; private readonly int DefaultImageExtractionTimeoutMs;
private readonly string StartupOptionFFmpegPath; private readonly string StartupOptionFFmpegPath;
private readonly string StartupOptionFFprobePath;
private readonly SemaphoreSlim _thumbnailResourcePool = new SemaphoreSlim(1, 1); private readonly SemaphoreSlim _thumbnailResourcePool = new SemaphoreSlim(1, 1);
private readonly List<ProcessWrapper> _runningProcesses = new List<ProcessWrapper>(); private readonly List<ProcessWrapper> _runningProcesses = new List<ProcessWrapper>();
@ -60,7 +59,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
ILoggerFactory loggerFactory, ILoggerFactory loggerFactory,
IJsonSerializer jsonSerializer, IJsonSerializer jsonSerializer,
string startupOptionsFFmpegPath, string startupOptionsFFmpegPath,
string startupOptionsFFprobePath,
IServerConfigurationManager configurationManager, IServerConfigurationManager configurationManager,
IFileSystem fileSystem, IFileSystem fileSystem,
Func<ISubtitleEncoder> subtitleEncoder, Func<ISubtitleEncoder> subtitleEncoder,
@ -71,7 +69,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
_logger = loggerFactory.CreateLogger(nameof(MediaEncoder)); _logger = loggerFactory.CreateLogger(nameof(MediaEncoder));
_jsonSerializer = jsonSerializer; _jsonSerializer = jsonSerializer;
StartupOptionFFmpegPath = startupOptionsFFmpegPath; StartupOptionFFmpegPath = startupOptionsFFmpegPath;
StartupOptionFFprobePath = startupOptionsFFprobePath;
ConfigurationManager = configurationManager; ConfigurationManager = configurationManager;
FileSystem = fileSystem; FileSystem = fileSystem;
SubtitleEncoder = subtitleEncoder; SubtitleEncoder = subtitleEncoder;
@ -86,12 +83,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
/// </summary> /// </summary>
public void SetFFmpegPath() 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 // 1) Custom path stored in config/encoding xml file under tag <EncoderAppPath> takes precedence
if (!ValidatePath(ConfigurationManager.GetConfiguration<EncodingOptions>("encoding").EncoderAppPath, FFmpegLocation.Custom)) if (!ValidatePath(ConfigurationManager.GetConfiguration<EncodingOptions>("encoding").EncoderAppPath, FFmpegLocation.Custom))
{ {

3
deployment/debian-package-x64/pkg-src/conf/jellyfin
Unescape View File

@ -23,7 +23,6 @@ JELLYFIN_RESTART_OPT="--restartpath=/usr/lib/jellyfin/restart.sh"
# ffmpeg binary paths, overriding the system values # ffmpeg binary paths, overriding the system values
JELLYFIN_FFMPEG_OPT="--ffmpeg=/usr/share/jellyfin-ffmpeg/ffmpeg" 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 # [OPTIONAL] run Jellyfin as a headless service
#JELLYFIN_SERVICE_OPT="--service" #JELLYFIN_SERVICE_OPT="--service"
@ -38,4 +37,4 @@ JELLYFIN_FFPROBE_OPT="--ffprobe=/usr/share/jellyfin-ffmpeg/ffprobe"
# Application username # Application username
JELLYFIN_USER="jellyfin" JELLYFIN_USER="jellyfin"
# Full application command # 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"

2
deployment/debian-package-x64/pkg-src/jellyfin.service
Unescape View File

@ -6,7 +6,7 @@ After = network.target
Type = simple Type = simple
EnvironmentFile = /etc/default/jellyfin EnvironmentFile = /etc/default/jellyfin
User = 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 Restart = on-failure
TimeoutSec = 15 TimeoutSec = 15

1
deployment/fedora-package-x64/pkg-src/jellyfin.env
Unescape View File

@ -25,7 +25,6 @@ JELLYFIN_RESTART_OPT="--restartpath=/usr/libexec/jellyfin/restart.sh"
# [OPTIONAL] ffmpeg binary paths, overriding the UI-configured values # [OPTIONAL] ffmpeg binary paths, overriding the UI-configured values
#JELLYFIN_FFMPEG_OPT="--ffmpeg=/usr/bin/ffmpeg" #JELLYFIN_FFMPEG_OPT="--ffmpeg=/usr/bin/ffmpeg"
#JELLYFIN_FFPROBE_OPT="--ffprobe=/usr/bin/ffprobe"
# [OPTIONAL] run Jellyfin as a headless service # [OPTIONAL] run Jellyfin as a headless service
#JELLYFIN_SERVICE_OPT="--service" #JELLYFIN_SERVICE_OPT="--service"

2
deployment/fedora-package-x64/pkg-src/jellyfin.service
Unescape View File

@ -5,7 +5,7 @@ Description=Jellyfin is a free software media system that puts you in control of
[Service] [Service]
EnvironmentFile=/etc/sysconfig/jellyfin EnvironmentFile=/etc/sysconfig/jellyfin
WorkingDirectory=/var/lib/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 TimeoutSec=15
Restart=on-failure Restart=on-failure
User=jellyfin User=jellyfin

Write Preview
Loading…
Cancel
Save