diff options
| author | Dominik <git@secnd.me> | 2023-06-15 19:55:11 +0200 |
|---|---|---|
| committer | Dominik <git@secnd.me> | 2023-06-15 19:55:11 +0200 |
| commit | 0dffe64489f826b91410bddc32ad2ceb1c5cc0d0 (patch) | |
| tree | 429f2d87311caf3f8b65feacff724977eac6ce10 | |
| parent | 17f1e8d19b1fd693893d66d2275ed8ae2476344e (diff) | |
Add baseUrlParam back in and fix indentation
| -rw-r--r-- | Jellyfin.Api/Controllers/DynamicHlsController.cs | 9 | ||||
| -rw-r--r-- | MediaBrowser.Model/Configuration/EncodingOptions.cs | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Jellyfin.Api/Controllers/DynamicHlsController.cs b/Jellyfin.Api/Controllers/DynamicHlsController.cs index 86be68004..9f2088e36 100644 --- a/Jellyfin.Api/Controllers/DynamicHlsController.cs +++ b/Jellyfin.Api/Controllers/DynamicHlsController.cs @@ -1632,6 +1632,15 @@ public class DynamicHlsController : BaseJellyfinApiController ? _encodingOptions.MaxMuxingQueueSize.ToString(CultureInfo.InvariantCulture) : "128"; + var baseUrlParam = string.Empty; + if (isEventPlaylist) + { + baseUrlParam = string.Format( + CultureInfo.InvariantCulture, + " -hls_base_url \"hls/{0}/\"", + Path.GetFileNameWithoutExtension(outputPath)); + } + var hlsArguments = GetHlsArguments(isEventPlaylist, state.SegmentLength); return string.Format( diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs index b5b6e86c8..f11a43122 100644 --- a/MediaBrowser.Model/Configuration/EncodingOptions.cs +++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs @@ -103,12 +103,12 @@ public class EncodingOptions /// Gets or sets the delay after which throttling happens. /// </summary> public int ThrottleDelaySeconds { get; set; } - + /// <summary> /// Gets or sets a value indicating whether segment deletion is enabled. /// </summary> public bool EnableSegmentDeletion { get; set; } - + /// <summary> /// Gets or sets seconds for which segments should be kept before being deleted. /// </summary> |