mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 11:34:57 +02:00
Merge pull request #4518 from crobibero/livetv-hls
Fix live tv hls playback
This commit is contained in:
commit
c901f1da41
1 changed files with 20 additions and 6 deletions
|
@ -112,11 +112,13 @@ namespace Jellyfin.Api.Controllers
|
||||||
/// <param name="segmentId">The segment id.</param>
|
/// <param name="segmentId">The segment id.</param>
|
||||||
/// <param name="segmentContainer">The segment container.</param>
|
/// <param name="segmentContainer">The segment container.</param>
|
||||||
/// <response code="200">Hls video segment returned.</response>
|
/// <response code="200">Hls video segment returned.</response>
|
||||||
|
/// <response code="404">Hls segment not found.</response>
|
||||||
/// <returns>A <see cref="FileStreamResult"/> containing the video segment.</returns>
|
/// <returns>A <see cref="FileStreamResult"/> containing the video segment.</returns>
|
||||||
// Can't require authentication just yet due to seeing some requests come from Chrome without full query string
|
// Can't require authentication just yet due to seeing some requests come from Chrome without full query string
|
||||||
// [Authenticated]
|
// [Authenticated]
|
||||||
[HttpGet("Videos/{itemId}/hls/{playlistId}/{segmentId}.{segmentContainer}")]
|
[HttpGet("Videos/{itemId}/hls/{playlistId}/{segmentId}.{segmentContainer}")]
|
||||||
[ProducesResponseType(StatusCodes.Status200OK)]
|
[ProducesResponseType(StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||||
[ProducesVideoFile]
|
[ProducesVideoFile]
|
||||||
[SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "itemId", Justification = "Required for ServiceStack")]
|
[SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "itemId", Justification = "Required for ServiceStack")]
|
||||||
public ActionResult GetHlsVideoSegmentLegacy(
|
public ActionResult GetHlsVideoSegmentLegacy(
|
||||||
|
@ -132,13 +134,25 @@ namespace Jellyfin.Api.Controllers
|
||||||
|
|
||||||
var normalizedPlaylistId = playlistId;
|
var normalizedPlaylistId = playlistId;
|
||||||
|
|
||||||
var playlistPath = _fileSystem.GetFilePaths(transcodeFolderPath)
|
var filePaths = _fileSystem.GetFilePaths(transcodeFolderPath);
|
||||||
.FirstOrDefault(i =>
|
// Add . to start of segment container for future use.
|
||||||
string.Equals(Path.GetExtension(i), ".m3u8", StringComparison.OrdinalIgnoreCase)
|
segmentContainer = segmentContainer.Insert(0, ".");
|
||||||
&& i.IndexOf(normalizedPlaylistId, StringComparison.OrdinalIgnoreCase) != -1)
|
string? playlistPath = null;
|
||||||
?? throw new ResourceNotFoundException($"Provided path ({transcodeFolderPath}) is not valid.");
|
foreach (var path in filePaths)
|
||||||
|
{
|
||||||
|
var pathExtension = Path.GetExtension(path);
|
||||||
|
if ((string.Equals(pathExtension, segmentContainer, StringComparison.OrdinalIgnoreCase)
|
||||||
|
|| string.Equals(pathExtension, ".m3u8", StringComparison.OrdinalIgnoreCase))
|
||||||
|
&& path.IndexOf(normalizedPlaylistId, StringComparison.OrdinalIgnoreCase) != -1)
|
||||||
|
{
|
||||||
|
playlistPath = path;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return GetFileResult(file, playlistPath);
|
return playlistPath == null
|
||||||
|
? NotFound("Hls segment not found.")
|
||||||
|
: GetFileResult(file, playlistPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
private ActionResult GetFileResult(string path, string playlistPath)
|
private ActionResult GetFileResult(string path, string playlistPath)
|
||||||
|
|
Loading…
Reference in a new issue