open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed chapter extraction

Browse Source
pull/702/head
Luke Pulverenti 11 years ago
parent 80ef863dfc
commit 43a806ad02
5 changed files with 76 additions and 42 deletions
Show Stats Download Patch File Download Diff File

3
MediaBrowser.Controller/MediaInfo/IMediaEncoder.cs
Unescape 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
Unescape 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
Unescape 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);

63
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
Unescape View File

@ -206,38 +206,58 @@ 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)
{
var service = ActiveService;
await _liveStreamSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
var recordings = await service.GetRecordingsAsync(cancellationToken).ConfigureAwait(false);
try
{
var service = ActiveService;
var recordings = await service.GetRecordingsAsync(cancellationToken).ConfigureAwait(false);
var recording = recordings.First(i => _tvDtoService.GetInternalRecordingId(service.Name, i.Id) == new Guid(id));
var recording = recordings.First(i => _tvDtoService.GetInternalRecordingId(service.Name, i.Id) == new Guid(id));
var result = await service.GetRecordingStream(recording.Id, cancellationToken).ConfigureAwait(false);
var result = await service.GetRecordingStream(recording.Id, cancellationToken).ConfigureAwait(false);
if (!string.IsNullOrEmpty(result.Id))
if (!string.IsNullOrEmpty(result.Id))
{
_openStreams.AddOrUpdate(result.Id, result, (key, info) => result);
}
return result;
}
finally
{
_openStreams.AddOrUpdate(result.Id, result, (key, info) => result);
_liveStreamSemaphore.Release();
}
return result;
}
public async Task<LiveStreamInfo> GetChannelStream(string id, CancellationToken cancellationToken)
{
var service = ActiveService;
await _liveStreamSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
var channel = GetInternalChannel(id);
try
{
var service = ActiveService;
var channel = GetInternalChannel(id);
var result = await service.GetChannelStream(channel.ChannelInfo.Id, cancellationToken).ConfigureAwait(false);
var result = await service.GetChannelStream(channel.ChannelInfo.Id, cancellationToken).ConfigureAwait(false);
if (!string.IsNullOrEmpty(result.Id))
if (!string.IsNullOrEmpty(result.Id))
{
_openStreams.AddOrUpdate(result.Id, result, (key, info) => result);
}
return result;
}
finally
{
_openStreams.AddOrUpdate(result.Id, result, (key, info) => result);
_liveStreamSemaphore.Release();
}
return result;
}
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()

39
MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs
Unescape 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);
}
@ -177,27 +178,27 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
CancellationToken cancellationToken)
{
var process = new Process
{
StartInfo = new ProcessStartInfo
{
StartInfo = new ProcessStartInfo
{
CreateNoWindow = true,
UseShellExecute = false,
CreateNoWindow = true,
UseShellExecute = false,
// Must consume both or ffmpeg may hang due to deadlocks. See comments below.
RedirectStandardOutput = true,
RedirectStandardError = true,
FileName = FFProbePath,
Arguments =
string.Format(
"{0} -i {1} -threads 0 -v info -print_format json -show_streams -show_format",
probeSizeArgument, inputPath).Trim(),
// Must consume both or ffmpeg may hang due to deadlocks. See comments below.
RedirectStandardOutput = true,
RedirectStandardError = true,
FileName = FFProbePath,
Arguments =
string.Format(
"{0} -i {1} -threads 0 -v info -print_format json -show_streams -show_format",
probeSizeArgument, inputPath).Trim(),
WindowStyle = ProcessWindowStyle.Hidden,
ErrorDialog = false
},
WindowStyle = ProcessWindowStyle.Hidden,
ErrorDialog = false
},
EnableRaisingEvents = true
};
EnableRaisingEvents = true
};
_logger.Debug("{0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);

Write Preview
Loading…
Cancel
Save