mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-07 03:48:06 +02:00
update external subs
This commit is contained in:
parent
dd17096b5d
commit
0f743205c4
4 changed files with 13 additions and 14 deletions
|
@ -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
|
||||||
|
|
|
@ -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)
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue