Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-23 15:30:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

update vtt headers

Browse Source
This commit is contained in:
Luke Pulverenti 2016-06-05 14:51:18 -04:00
parent 3ad76acf4d
commit a9b0816922
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
MediaBrowser.Api/Subtitles/SubtitleService.cs
View File

@ -101,6 +101,7 @@ namespace MediaBrowser.Api.Subtitles
[ApiMember(Name = "CopyTimestamps", Description = "CopyTimestamps", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")] [ApiMember(Name = "CopyTimestamps", Description = "CopyTimestamps", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
public bool CopyTimestamps { get; set; } public bool CopyTimestamps { get; set; }
public bool AddVttTimeMap { get; set; }
} }
[Route("/Videos/{Id}/{MediaSourceId}/Subtitles/{Index}/subtitles.m3u8", "GET", Summary = "Gets an HLS subtitle playlist.")] [Route("/Videos/{Id}/{MediaSourceId}/Subtitles/{Index}/subtitles.m3u8", "GET", Summary = "Gets an HLS subtitle playlist.")]
@ -193,7 +194,7 @@ namespace MediaBrowser.Api.Subtitles
return ResultFactory.GetResult(builder.ToString(), MimeTypes.GetMimeType("playlist.m3u8"), new Dictionary<string, string>()); return ResultFactory.GetResult(builder.ToString(), MimeTypes.GetMimeType("playlist.m3u8"), new Dictionary<string, string>());
} }
public object Get(GetSubtitle request) public async Task<object> Get(GetSubtitle request)
{ {
if (string.Equals(request.Format, "js", StringComparison.OrdinalIgnoreCase)) if (string.Equals(request.Format, "js", StringComparison.OrdinalIgnoreCase))
{ {
@ -212,21 +213,32 @@ namespace MediaBrowser.Api.Subtitles
return ToStaticFileResult(subtitleStream.Path); return ToStaticFileResult(subtitleStream.Path);
} }
var stream = GetSubtitles(request).Result; using (var stream = await GetSubtitles(request).ConfigureAwait(false))
{
using (var reader = new StreamReader(stream))
{
var text = reader.ReadToEnd();
return ResultFactory.GetResult(stream, MimeTypes.GetMimeType("file." + request.Format)); if (string.Equals(request.Format, "vtt", StringComparison.OrdinalIgnoreCase))
{
text = text.Replace("WEBVTT", "WEBVTT\nX-TIMESTAMP-MAP=MPEGTS:900000,LOCAL:00:00:00.000");
} }
private async Task<Stream> GetSubtitles(GetSubtitle request) return ResultFactory.GetResult(text, MimeTypes.GetMimeType("file." + request.Format));
}
}
}
private Task<Stream> GetSubtitles(GetSubtitle request)
{ {
return await _subtitleEncoder.GetSubtitles(request.Id, return _subtitleEncoder.GetSubtitles(request.Id,
request.MediaSourceId, request.MediaSourceId,
request.Index, request.Index,
request.Format, request.Format,
request.StartPositionTicks, request.StartPositionTicks,
request.EndPositionTicks, request.EndPositionTicks,
request.CopyTimestamps, request.CopyTimestamps,
CancellationToken.None).ConfigureAwait(false); CancellationToken.None);
} }
public object Get(SearchRemoteSubtitles request) public object Get(SearchRemoteSubtitles request)