diff options
| author | Claus Vium <cvium@users.noreply.github.com> | 2020-11-20 08:17:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-20 08:17:05 +0100 |
| commit | 84fe0462266c377caa2dcc5a919230cab0fe694c (patch) | |
| tree | 8e2ed75e7e96f6c11b064a11254e722cc907874d /Jellyfin.Api/Controllers/UniversalAudioController.cs | |
| parent | 8b23c4e241f33b65a2b5013e849d09d40bf41f2a (diff) | |
| parent | 44ff7a48436123e7290c576e2ca97c400e9f0ffa (diff) | |
Merge pull request #4432 from nyanmisaka/fmp4-hls
Add initial support for HEVC over FMP4-HLS
Diffstat (limited to 'Jellyfin.Api/Controllers/UniversalAudioController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/UniversalAudioController.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Jellyfin.Api/Controllers/UniversalAudioController.cs b/Jellyfin.Api/Controllers/UniversalAudioController.cs index e10f1fe91..9820c401a 100644 --- a/Jellyfin.Api/Controllers/UniversalAudioController.cs +++ b/Jellyfin.Api/Controllers/UniversalAudioController.cs @@ -191,8 +191,11 @@ namespace Jellyfin.Api.Controllers if (!isStatic && string.Equals(mediaSource.TranscodingSubProtocol, "hls", StringComparison.OrdinalIgnoreCase)) { // hls segment container can only be mpegts or fmp4 per ffmpeg documentation + // ffmpeg option -> file extension + // mpegts -> ts + // fmp4 -> mp4 // TODO: remove this when we switch back to the segment muxer - var supportedHlsContainers = new[] { "mpegts", "fmp4" }; + var supportedHlsContainers = new[] { "ts", "mp4" }; var dynamicHlsRequestDto = new HlsAudioRequestDto { @@ -201,7 +204,7 @@ namespace Jellyfin.Api.Controllers Static = isStatic, PlaySessionId = info.PlaySessionId, // fallback to mpegts if device reports some weird value unsupported by hls - SegmentContainer = Array.Exists(supportedHlsContainers, element => element == transcodingContainer) ? transcodingContainer : "mpegts", + SegmentContainer = Array.Exists(supportedHlsContainers, element => element == transcodingContainer) ? transcodingContainer : "ts", MediaSourceId = mediaSourceId, DeviceId = deviceId, AudioCodec = audioCodec, |