diff options
| author | Niels van Velzen <nielsvanvelzen@users.noreply.github.com> | 2024-03-05 00:44:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-04 16:44:54 -0700 |
| commit | 407cf5d0bf9d3563ae77fd34ce29ffae5af4339f (patch) | |
| tree | 2640dfb680cc4f302ec2dbeeb2a7cd9536005b80 /Jellyfin.Api/Controllers/UniversalAudioController.cs | |
| parent | 83d2bc3f9f13c62f6d3ef16c4fe75f0f5a18110d (diff) | |
Add MediaStreamProtocol enum (#10153)
* Add MediaStreamProtocol enum
* Add default handling for enum during deserialization
---------
Co-authored-by: Cody Robibero <cody@robibe.ro>
Diffstat (limited to 'Jellyfin.Api/Controllers/UniversalAudioController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/UniversalAudioController.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Jellyfin.Api/Controllers/UniversalAudioController.cs b/Jellyfin.Api/Controllers/UniversalAudioController.cs index 0a416aedb..4c3ef2c7f 100644 --- a/Jellyfin.Api/Controllers/UniversalAudioController.cs +++ b/Jellyfin.Api/Controllers/UniversalAudioController.cs @@ -8,6 +8,7 @@ using Jellyfin.Api.Attributes; using Jellyfin.Api.Helpers; using Jellyfin.Api.ModelBinders; using Jellyfin.Api.Models.StreamingDtos; +using Jellyfin.Data.Enums; using MediaBrowser.Common.Extensions; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.MediaEncoding; @@ -98,7 +99,7 @@ public class UniversalAudioController : BaseJellyfinApiController [FromQuery] int? audioBitRate, [FromQuery] long? startTimeTicks, [FromQuery] string? transcodingContainer, - [FromQuery] string? transcodingProtocol, + [FromQuery] MediaStreamProtocol? transcodingProtocol, [FromQuery] int? maxAudioSampleRate, [FromQuery] int? maxAudioBitDepth, [FromQuery] bool? enableRemoteMedia, @@ -156,7 +157,7 @@ public class UniversalAudioController : BaseJellyfinApiController } var isStatic = mediaSource.SupportsDirectStream; - if (!isStatic && string.Equals(mediaSource.TranscodingSubProtocol, "hls", StringComparison.OrdinalIgnoreCase)) + if (!isStatic && mediaSource.TranscodingSubProtocol == MediaStreamProtocol.Hls) { // hls segment container can only be mpegts or fmp4 per ffmpeg documentation // ffmpeg option -> file extension @@ -232,7 +233,7 @@ public class UniversalAudioController : BaseJellyfinApiController string[] containers, string? transcodingContainer, string? audioCodec, - string? transcodingProtocol, + MediaStreamProtocol? transcodingProtocol, bool? breakOnNonKeyFrames, int? transcodingAudioChannels, int? maxAudioSampleRate, @@ -267,7 +268,7 @@ public class UniversalAudioController : BaseJellyfinApiController Context = EncodingContext.Streaming, Container = transcodingContainer ?? "mp3", AudioCodec = audioCodec ?? "mp3", - Protocol = transcodingProtocol ?? "http", + Protocol = transcodingProtocol ?? MediaStreamProtocol.Http, BreakOnNonKeyFrames = breakOnNonKeyFrames ?? false, MaxAudioChannels = transcodingAudioChannels?.ToString(CultureInfo.InvariantCulture) } |
