mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 19:37:55 +02:00
3.2.30.14
This commit is contained in:
parent
fe10df6935
commit
9440fdc719
4 changed files with 46 additions and 56 deletions
|
@ -26,10 +26,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
|
||||||
private readonly CancellationTokenSource _liveStreamCancellationTokenSource = new CancellationTokenSource();
|
private readonly CancellationTokenSource _liveStreamCancellationTokenSource = new CancellationTokenSource();
|
||||||
private readonly TaskCompletionSource<bool> _liveStreamTaskCompletionSource = new TaskCompletionSource<bool>();
|
private readonly TaskCompletionSource<bool> _liveStreamTaskCompletionSource = new TaskCompletionSource<bool>();
|
||||||
|
|
||||||
private readonly MulticastStream _multicastStream;
|
|
||||||
|
|
||||||
private readonly string _tempFilePath;
|
private readonly string _tempFilePath;
|
||||||
private bool _enableFileBuffer = false;
|
|
||||||
|
|
||||||
public HdHomerunHttpStream(MediaSourceInfo mediaSource, string originalStreamId, IFileSystem fileSystem, IHttpClient httpClient, ILogger logger, IServerApplicationPaths appPaths, IServerApplicationHost appHost, IEnvironmentInfo environment)
|
public HdHomerunHttpStream(MediaSourceInfo mediaSource, string originalStreamId, IFileSystem fileSystem, IHttpClient httpClient, ILogger logger, IServerApplicationPaths appPaths, IServerApplicationHost appHost, IEnvironmentInfo environment)
|
||||||
: base(mediaSource, environment, fileSystem)
|
: base(mediaSource, environment, fileSystem)
|
||||||
|
@ -39,7 +36,6 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
|
||||||
_appHost = appHost;
|
_appHost = appHost;
|
||||||
OriginalStreamId = originalStreamId;
|
OriginalStreamId = originalStreamId;
|
||||||
|
|
||||||
_multicastStream = new MulticastStream(_logger);
|
|
||||||
_tempFilePath = Path.Combine(appPaths.TranscodingTempPath, UniqueId + ".ts");
|
_tempFilePath = Path.Combine(appPaths.TranscodingTempPath, UniqueId + ".ts");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -63,6 +59,9 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
|
||||||
|
|
||||||
OpenedMediaSource.Path = _appHost.GetLocalApiUrl("127.0.0.1") + "/LiveTv/LiveStreamFiles/" + UniqueId + "/stream.ts";
|
OpenedMediaSource.Path = _appHost.GetLocalApiUrl("127.0.0.1") + "/LiveTv/LiveStreamFiles/" + UniqueId + "/stream.ts";
|
||||||
OpenedMediaSource.Protocol = MediaProtocol.Http;
|
OpenedMediaSource.Protocol = MediaProtocol.Http;
|
||||||
|
|
||||||
|
//OpenedMediaSource.Path = _tempFilePath;
|
||||||
|
//OpenedMediaSource.Protocol = MediaProtocol.File;
|
||||||
//OpenedMediaSource.SupportsDirectPlay = false;
|
//OpenedMediaSource.SupportsDirectPlay = false;
|
||||||
//OpenedMediaSource.SupportsDirectStream = true;
|
//OpenedMediaSource.SupportsDirectStream = true;
|
||||||
//OpenedMediaSource.SupportsTranscoding = true;
|
//OpenedMediaSource.SupportsTranscoding = true;
|
||||||
|
@ -107,19 +106,10 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
|
||||||
{
|
{
|
||||||
_logger.Info("Beginning multicastStream.CopyUntilCancelled");
|
_logger.Info("Beginning multicastStream.CopyUntilCancelled");
|
||||||
|
|
||||||
if (_enableFileBuffer)
|
FileSystem.CreateDirectory(FileSystem.GetDirectoryName(_tempFilePath));
|
||||||
|
using (var fileStream = FileSystem.GetFileStream(_tempFilePath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, FileOpenOptions.None))
|
||||||
{
|
{
|
||||||
FileSystem.CreateDirectory(FileSystem.GetDirectoryName(_tempFilePath));
|
StreamHelper.CopyTo(response.Content, fileStream, 81920, () => Resolve(openTaskCompletionSource), cancellationToken);
|
||||||
using (var fileStream = FileSystem.GetFileStream(_tempFilePath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, FileOpenOptions.None))
|
|
||||||
{
|
|
||||||
StreamHelper.CopyTo(response.Content, fileStream, 81920, () => Resolve(openTaskCompletionSource), cancellationToken);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Resolve(openTaskCompletionSource);
|
|
||||||
|
|
||||||
await _multicastStream.CopyUntilCancelled(response.Content, null, cancellationToken).ConfigureAwait(false);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -158,7 +148,33 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
|
||||||
|
|
||||||
public Task CopyToAsync(Stream stream, CancellationToken cancellationToken)
|
public Task CopyToAsync(Stream stream, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
return _multicastStream.CopyToAsync(stream, cancellationToken);
|
return CopyFileTo(_tempFilePath, stream, cancellationToken);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected async Task CopyFileTo(string path, Stream outputStream, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
long startPosition = -20000;
|
||||||
|
|
||||||
|
_logger.Info("Live stream starting position is {0} bytes", startPosition.ToString(CultureInfo.InvariantCulture));
|
||||||
|
|
||||||
|
var allowAsync = false;//Environment.OperatingSystem != MediaBrowser.Model.System.OperatingSystem.Windows;
|
||||||
|
// use non-async filestream along with read due to https://github.com/dotnet/corefx/issues/6039
|
||||||
|
|
||||||
|
using (var inputStream = (FileStream)GetInputStream(path, allowAsync))
|
||||||
|
{
|
||||||
|
if (startPosition > 0)
|
||||||
|
{
|
||||||
|
inputStream.Seek(-20000, SeekOrigin.End);
|
||||||
|
}
|
||||||
|
|
||||||
|
while (!cancellationToken.IsCancellationRequested)
|
||||||
|
{
|
||||||
|
StreamHelper.CopyTo(inputStream, outputStream, 81920, cancellationToken);
|
||||||
|
|
||||||
|
//var position = fs.Position;
|
||||||
|
//_logger.Debug("Streamed {0} bytes to position {1} from file {2}", bytesRead, position, path);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,8 +34,6 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
|
||||||
private readonly INetworkManager _networkManager;
|
private readonly INetworkManager _networkManager;
|
||||||
|
|
||||||
private readonly string _tempFilePath;
|
private readonly string _tempFilePath;
|
||||||
private bool _enableFileBuffer = false;
|
|
||||||
private readonly MulticastStream _multicastStream;
|
|
||||||
|
|
||||||
public HdHomerunUdpStream(MediaSourceInfo mediaSource, string originalStreamId, IHdHomerunChannelCommands channelCommands, int numTuners, IFileSystem fileSystem, IHttpClient httpClient, ILogger logger, IServerApplicationPaths appPaths, IServerApplicationHost appHost, ISocketFactory socketFactory, INetworkManager networkManager, IEnvironmentInfo environment)
|
public HdHomerunUdpStream(MediaSourceInfo mediaSource, string originalStreamId, IHdHomerunChannelCommands channelCommands, int numTuners, IFileSystem fileSystem, IHttpClient httpClient, ILogger logger, IServerApplicationPaths appPaths, IServerApplicationHost appHost, ISocketFactory socketFactory, INetworkManager networkManager, IEnvironmentInfo environment)
|
||||||
: base(mediaSource, environment, fileSystem)
|
: base(mediaSource, environment, fileSystem)
|
||||||
|
@ -48,7 +46,6 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
|
||||||
_channelCommands = channelCommands;
|
_channelCommands = channelCommands;
|
||||||
_numTuners = numTuners;
|
_numTuners = numTuners;
|
||||||
_tempFilePath = Path.Combine(appPaths.TranscodingTempPath, UniqueId + ".ts");
|
_tempFilePath = Path.Combine(appPaths.TranscodingTempPath, UniqueId + ".ts");
|
||||||
_multicastStream = new MulticastStream(_logger);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override async Task OpenInternal(CancellationToken openCancellationToken)
|
protected override async Task OpenInternal(CancellationToken openCancellationToken)
|
||||||
|
@ -126,17 +123,10 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
|
||||||
|
|
||||||
if (!cancellationToken.IsCancellationRequested)
|
if (!cancellationToken.IsCancellationRequested)
|
||||||
{
|
{
|
||||||
if (_enableFileBuffer)
|
FileSystem.CreateDirectory(FileSystem.GetDirectoryName(_tempFilePath));
|
||||||
|
using (var fileStream = FileSystem.GetFileStream(_tempFilePath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, FileOpenOptions.None))
|
||||||
{
|
{
|
||||||
FileSystem.CreateDirectory(FileSystem.GetDirectoryName(_tempFilePath));
|
CopyTo(udpClient, fileStream, openTaskCompletionSource, cancellationToken);
|
||||||
using (var fileStream = FileSystem.GetFileStream(_tempFilePath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, FileOpenOptions.None))
|
|
||||||
{
|
|
||||||
CopyTo(udpClient, fileStream, openTaskCompletionSource, cancellationToken);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
await _multicastStream.CopyUntilCancelled(new UdpClientStream(udpClient), () => Resolve(openTaskCompletionSource), cancellationToken).ConfigureAwait(false);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -178,49 +168,33 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task CopyToAsync(Stream outputStream, CancellationToken cancellationToken)
|
public Task CopyToAsync(Stream stream, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
if (!_enableFileBuffer)
|
return CopyFileTo(_tempFilePath, stream, cancellationToken);
|
||||||
{
|
}
|
||||||
await _multicastStream.CopyToAsync(outputStream, cancellationToken).ConfigureAwait(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var path = _tempFilePath;
|
|
||||||
|
|
||||||
|
protected async Task CopyFileTo(string path, Stream outputStream, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
long startPosition = -20000;
|
long startPosition = -20000;
|
||||||
if (startPosition < 0)
|
|
||||||
{
|
|
||||||
var length = FileSystem.GetFileInfo(path).Length;
|
|
||||||
startPosition = Math.Max(length - startPosition, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
_logger.Info("Live stream starting position is {0} bytes", startPosition.ToString(CultureInfo.InvariantCulture));
|
_logger.Info("Live stream starting position is {0} bytes", startPosition.ToString(CultureInfo.InvariantCulture));
|
||||||
|
|
||||||
var allowAsync = Environment.OperatingSystem != MediaBrowser.Model.System.OperatingSystem.Windows;
|
var allowAsync = false;//Environment.OperatingSystem != MediaBrowser.Model.System.OperatingSystem.Windows;
|
||||||
// use non-async filestream along with read due to https://github.com/dotnet/corefx/issues/6039
|
// use non-async filestream along with read due to https://github.com/dotnet/corefx/issues/6039
|
||||||
|
|
||||||
using (var inputStream = GetInputStream(path, startPosition, allowAsync))
|
using (var inputStream = (FileStream)GetInputStream(path, allowAsync))
|
||||||
{
|
{
|
||||||
if (startPosition > 0)
|
if (startPosition > 0)
|
||||||
{
|
{
|
||||||
inputStream.Position = startPosition;
|
inputStream.Seek(-20000, SeekOrigin.End);
|
||||||
}
|
}
|
||||||
|
|
||||||
while (!cancellationToken.IsCancellationRequested)
|
while (!cancellationToken.IsCancellationRequested)
|
||||||
{
|
{
|
||||||
long bytesRead;
|
|
||||||
|
|
||||||
StreamHelper.CopyTo(inputStream, outputStream, 81920, cancellationToken);
|
StreamHelper.CopyTo(inputStream, outputStream, 81920, cancellationToken);
|
||||||
bytesRead = 1;
|
|
||||||
|
|
||||||
//var position = fs.Position;
|
//var position = fs.Position;
|
||||||
//_logger.Debug("Streamed {0} bytes to position {1} from file {2}", bytesRead, position, path);
|
//_logger.Debug("Streamed {0} bytes to position {1} from file {2}", bytesRead, position, path);
|
||||||
|
|
||||||
if (bytesRead == 0)
|
|
||||||
{
|
|
||||||
await Task.Delay(100, cancellationToken).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,7 +51,7 @@ namespace MediaBrowser.Controller.LiveTv
|
||||||
return Task.FromResult(true);
|
return Task.FromResult(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Stream GetInputStream(string path, long startPosition, bool allowAsyncFileRead)
|
protected Stream GetInputStream(string path, bool allowAsyncFileRead)
|
||||||
{
|
{
|
||||||
var fileOpenOptions = FileOpenOptions.SequentialScan;
|
var fileOpenOptions = FileOpenOptions.SequentialScan;
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyVersion("3.2.30.13")]
|
[assembly: AssemblyVersion("3.2.30.14")]
|
||||||
|
|
Loading…
Reference in a new issue