Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-08 23:00:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed chapter extraction

Browse source
This commit is contained in:
Luke Pulverenti 2014-01-17 11:36:01 -05:00
parent 80ef863dfc
commit 43a806ad02
5 changed files with 81 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
MediaBrowser.Controller/MediaInfo/IMediaEncoder.cs
View file

@ -61,9 +61,10 @@ namespace MediaBrowser.Controller.MediaInfo
/// </summary>
/// <param name="inputFiles">The input files.</param>
/// <param name="type">The type.</param>
/// <param name="isAudio">if set to <c>true</c> [is audio].</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
Task<InternalMediaInfoResult> GetMediaInfo(string[] inputFiles, InputType type, CancellationToken cancellationToken);
Task<InternalMediaInfoResult> GetMediaInfo(string[] inputFiles, InputType type, bool isAudio, CancellationToken cancellationToken);
/// <summary>
/// Gets the probe size argument.

3
MediaBrowser.Providers/MediaInfo/BaseFFProbeProvider.cs
View file

@ -1,5 +1,6 @@
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.MediaInfo;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
@ -117,7 +118,7 @@ namespace MediaBrowser.Providers.MediaInfo
inputPath = MediaEncoderHelpers.GetInputArgument(video.Path, video.LocationType == LocationType.Remote, video.VideoType, video.IsoType, isoMount, video.PlayableStreamFileNames, out type);
}
return await MediaEncoder.GetMediaInfo(inputPath, type, cancellationToken).ConfigureAwait(false);
return await MediaEncoder.GetMediaInfo(inputPath, type, item is Audio, cancellationToken).ConfigureAwait(false);
}
/// <summary>

10
MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
View file

@ -255,13 +255,15 @@ namespace MediaBrowser.Server.Implementations.HttpServer
{
LogHttpRequest(context, index);
if (context.Request.IsWebSocketRequest)
var request = context.Request;
if (request.IsWebSocketRequest)
{
ProcessWebSocketRequest(context);
return;
}
var localPath = context.Request.Url.LocalPath;
var localPath = request.Url.LocalPath;
if (string.Equals(localPath, "/mediabrowser/", StringComparison.OrdinalIgnoreCase))
{
@ -288,8 +290,8 @@ namespace MediaBrowser.Server.Implementations.HttpServer
return;
}
var url = context.Request.Url.ToString();
var endPoint = context.Request.RemoteEndPoint;
var url = request.Url.ToString();
var endPoint = request.RemoteEndPoint;
await ProcessRequestAsync(context).ConfigureAwait(false);

33
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View file

@ -206,7 +206,13 @@ namespace MediaBrowser.Server.Implementations.LiveTv
return await GetRecording(recording, service.Name, cancellationToken).ConfigureAwait(false);
}
private readonly SemaphoreSlim _liveStreamSemaphore = new SemaphoreSlim(1, 1);
public async Task<LiveStreamInfo> GetRecordingStream(string id, CancellationToken cancellationToken)
{
await _liveStreamSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
try
{
var service = ActiveService;
@ -223,8 +229,17 @@ namespace MediaBrowser.Server.Implementations.LiveTv
return result;
}
finally
{
_liveStreamSemaphore.Release();
}
}
public async Task<LiveStreamInfo> GetChannelStream(string id, CancellationToken cancellationToken)
{
await _liveStreamSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
try
{
var service = ActiveService;
@ -239,6 +254,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv
return result;
}
finally
{
_liveStreamSemaphore.Release();
}
}
private async Task<LiveTvChannel> GetChannel(ChannelInfo channelInfo, string serviceName, CancellationToken cancellationToken)
{
@ -1243,9 +1263,18 @@ namespace MediaBrowser.Server.Implementations.LiveTv
};
}
public Task CloseLiveStream(string id, CancellationToken cancellationToken)
public async Task CloseLiveStream(string id, CancellationToken cancellationToken)
{
return ActiveService.CloseLiveStream(id, cancellationToken);
await _liveStreamSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
try
{
await ActiveService.CloseLiveStream(id, cancellationToken).ConfigureAwait(false);
}
finally
{
_liveStreamSemaphore.Release();
}
}
public GuideInfo GetGuideInfo()

5
MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs
View file

@ -102,12 +102,13 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
/// </summary>
/// <param name="inputFiles">The input files.</param>
/// <param name="type">The type.</param>
/// <param name="isAudio">if set to <c>true</c> [is audio].</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
public Task<InternalMediaInfoResult> GetMediaInfo(string[] inputFiles, InputType type,
public Task<InternalMediaInfoResult> GetMediaInfo(string[] inputFiles, InputType type, bool isAudio,
CancellationToken cancellationToken)
{
return GetMediaInfoInternal(GetInputArgument(inputFiles, type), type != InputType.File,
return GetMediaInfoInternal(GetInputArgument(inputFiles, type), !isAudio,
GetProbeSizeArgument(type), cancellationToken);
}