Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-09-07 03:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity

update external subs

Browse source
This commit is contained in:
Luke Pulverenti 2015-09-12 12:39:24 -04:00
parent dd17096b5d
commit 0f743205c4
4 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Emby.Drawing/ImageProcessor.cs
View file

@ -227,6 +227,9 @@ namespace Emby.Drawing
imageProcessingLockTaken = true; imageProcessingLockTaken = true;
_imageEncoder.EncodeImage(originalImagePath, cacheFilePath, newWidth, newHeight, quality, options); _imageEncoder.EncodeImage(originalImagePath, cacheFilePath, newWidth, newHeight, quality, options);
// ImageMagick doesn't seem to always release it right away
await Task.Delay(100).ConfigureAwait(false);
} }
} }
finally finally

6
MediaBrowser.Model/Dlna/StreamBuilder.cs
View file

@ -759,15 +759,13 @@ namespace MediaBrowser.Model.Dlna
if (profile.Method == SubtitleDeliveryMethod.External && subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format)) if (profile.Method == SubtitleDeliveryMethod.External && subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format))
{ {
if (!requiresConversion) if (subtitleStream.IsTextSubtitleStream || !requiresConversion)
{ {
return profile;
}
if (subtitleStream.SupportsExternalStream) if (subtitleStream.SupportsExternalStream)
{ {
return profile; return profile;
} }
}
// For sync we can handle the longer extraction times // For sync we can handle the longer extraction times
if (context == EncodingContext.Static && subtitleStream.IsTextSubtitleStream) if (context == EncodingContext.Static && subtitleStream.IsTextSubtitleStream)

3
MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
View file

@ -127,10 +127,13 @@ namespace MediaBrowser.Server.Implementations.Library
{ {
var supportsExternalStream = StreamSupportsExternalStream(subStream); var supportsExternalStream = StreamSupportsExternalStream(subStream);
if (!subStream.IsExternal)
{
if (supportsExternalStream && videoBitrate >= maxAllowedBitrateForExternalSubtitleStream) if (supportsExternalStream && videoBitrate >= maxAllowedBitrateForExternalSubtitleStream)
{ {
supportsExternalStream = false; supportsExternalStream = false;
} }
}
subStream.SupportsExternalStream = supportsExternalStream; subStream.SupportsExternalStream = supportsExternalStream;
} }

5
MediaBrowser.Server.Implementations/Sync/SyncManager.cs
View file

@ -539,11 +539,6 @@ namespace MediaBrowser.Server.Implementations.Sync
return false; return false;
} }
if (video.IsStacked)
{
return false;
}
if (video.IsShortcut) if (video.IsShortcut)
{ {
return false; return false;