pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update external subs

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

12
MediaBrowser.Model/Dlna/StreamBuilder.cs
View File

@ -759,14 +759,12 @@ 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)
} {
return profile;
if (subtitleStream.SupportsExternalStream) }
{
return profile;
} }
// For sync we can handle the longer extraction times // For sync we can handle the longer extraction times

7
MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
View File

@ -127,9 +127,12 @@ namespace MediaBrowser.Server.Implementations.Library
{ {
var supportsExternalStream = StreamSupportsExternalStream(subStream); var supportsExternalStream = StreamSupportsExternalStream(subStream);
if (supportsExternalStream && videoBitrate >= maxAllowedBitrateForExternalSubtitleStream) if (!subStream.IsExternal)
{ {
supportsExternalStream = false; if (supportsExternalStream && videoBitrate >= maxAllowedBitrateForExternalSubtitleStream)
{
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;