michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

update image magick orientation function

Browse Source
This commit is contained in:
Luke Pulverenti 2017-10-11 02:24:22 -04:00
parent 3e0cfd3af3
commit 851c62a940
4 changed files with 39 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Drawing.ImageMagick/ImageMagickEncoder.cs
View File

@ -149,7 +149,7 @@ namespace Emby.Drawing.ImageMagick
var originalImageSize = new ImageSize(originalImage.CurrentImage.Width, originalImage.CurrentImage.Height); var originalImageSize = new ImageSize(originalImage.CurrentImage.Width, originalImage.CurrentImage.Height);
if (!options.CropWhiteSpace && options.HasDefaultOptions(inputPath, originalImageSize)) if (!options.CropWhiteSpace && options.HasDefaultOptions(inputPath, originalImageSize) && !autoOrient)
{ {
// Just spit out the original file if all the options are default // Just spit out the original file if all the options are default
return inputPath; return inputPath;

74
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHttpStream.cs
View File

@ -33,7 +33,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
OriginalStreamId = originalStreamId; OriginalStreamId = originalStreamId;
} }
protected override Task OpenInternal(CancellationToken openCancellationToken) protected override Task OpenInternal(CancellationToken openCancellationToken)
{ {
_liveStreamCancellationTokenSource.Token.ThrowIfCancellationRequested(); _liveStreamCancellationTokenSource.Token.ThrowIfCancellationRequested();
@ -77,56 +77,38 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
{ {
return Task.Run(async () => return Task.Run(async () =>
{ {
var isFirstAttempt = true; try
while (!cancellationToken.IsCancellationRequested)
{ {
try using (var response = await _httpClient.SendAsync(new HttpRequestOptions
{ {
using (var response = await _httpClient.SendAsync(new HttpRequestOptions Url = url,
CancellationToken = cancellationToken,
BufferContent = false,
// Increase a little bit
TimeoutMs = 30000,
EnableHttpCompression = false
}, "GET").ConfigureAwait(false))
{
Logger.Info("Opened HDHR stream from {0}", url);
Logger.Info("Beginning multicastStream.CopyUntilCancelled");
FileSystem.CreateDirectory(FileSystem.GetDirectoryName(TempFilePath));
using (var fileStream = FileSystem.GetFileStream(TempFilePath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, FileOpenOptions.None))
{ {
Url = url, StreamHelper.CopyTo(response.Content, fileStream, 81920, () => Resolve(openTaskCompletionSource), cancellationToken);
CancellationToken = cancellationToken,
BufferContent = false,
// Increase a little bit
TimeoutMs = 30000,
EnableHttpCompression = false
}, "GET").ConfigureAwait(false))
{
Logger.Info("Opened HDHR stream from {0}", url);
if (!cancellationToken.IsCancellationRequested)
{
Logger.Info("Beginning multicastStream.CopyUntilCancelled");
FileSystem.CreateDirectory(FileSystem.GetDirectoryName(TempFilePath));
using (var fileStream = FileSystem.GetFileStream(TempFilePath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, FileOpenOptions.None))
{
StreamHelper.CopyTo(response.Content, fileStream, 81920, () => Resolve(openTaskCompletionSource), cancellationToken);
}
}
} }
} }
catch (OperationCanceledException) }
{ catch (OperationCanceledException)
break; {
} }
catch (Exception ex) catch (Exception ex)
{ {
if (isFirstAttempt) Logger.ErrorException("Error copying live stream.", ex);
{
Logger.ErrorException("Error opening live stream:", ex);
openTaskCompletionSource.TrySetException(ex);
break;
}
Logger.ErrorException("Error copying live stream, will reopen", ex);
}
isFirstAttempt = false;
} }
_liveStreamTaskCompletionSource.TrySetResult(true); _liveStreamTaskCompletionSource.TrySetResult(true);

2
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@ -1638,7 +1638,7 @@ namespace MediaBrowser.Controller.MediaEncoding
if (state.InputProtocol == MediaProtocol.Rtsp) if (state.InputProtocol == MediaProtocol.Rtsp)
{ {
inputModifier += " -rtsp_transport tcp"; inputModifier += " -rtsp_transport tcp -rtsp_transport udp -rtsp_flags prefer_tcp";
} }
if (!string.IsNullOrEmpty(state.InputAudioSync)) if (!string.IsNullOrEmpty(state.InputAudioSync))

24
MediaBrowser.Providers/Manager/ItemImageProvider.cs
View File

@ -517,21 +517,11 @@ namespace MediaBrowser.Providers.Manager
return true; return true;
} }
if (libraryOptions.DownloadImagesInAdvance)
{
return false;
}
if (item.LocationType == LocationType.Remote || item.LocationType == LocationType.Virtual) if (item.LocationType == LocationType.Remote || item.LocationType == LocationType.Virtual)
{ {
return true; return true;
} }
if (!item.IsSaveLocalMetadataEnabled())
{
return true;
}
if (item is IItemByName && !(item is MusicArtist)) if (item is IItemByName && !(item is MusicArtist))
{ {
var hasDualAccess = item as IHasDualAccess; var hasDualAccess = item as IHasDualAccess;
@ -541,13 +531,17 @@ namespace MediaBrowser.Providers.Manager
} }
} }
switch (type) if (libraryOptions.DownloadImagesInAdvance)
{ {
case ImageType.Primary: return false;
return true;
default:
return true;
} }
//if (!item.IsSaveLocalMetadataEnabled())
//{
// return true;
//}
return true;
} }
private void SaveImageStub(IHasMetadata item, ImageType imageType, IEnumerable<string> urls) private void SaveImageStub(IHasMetadata item, ImageType imageType, IEnumerable<string> urls)