mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-07-09 03:04:24 -04:00
fix dlna direct play on samsung tv's
This commit is contained in:
parent
f3120dbee9
commit
39394e74c7
@ -2211,6 +2211,8 @@ namespace Emby.Server.Implementations
|
|||||||
TimeSpan.FromHours(12) :
|
TimeSpan.FromHours(12) :
|
||||||
TimeSpan.FromMinutes(5);
|
TimeSpan.FromMinutes(5);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
var result = await new GithubUpdater(HttpClient, JsonSerializer).CheckForUpdateResult("MediaBrowser",
|
var result = await new GithubUpdater(HttpClient, JsonSerializer).CheckForUpdateResult("MediaBrowser",
|
||||||
"Emby",
|
"Emby",
|
||||||
ApplicationVersion,
|
ApplicationVersion,
|
||||||
@ -2225,6 +2227,21 @@ namespace Emby.Server.Implementations
|
|||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
catch (HttpException ex)
|
||||||
|
{
|
||||||
|
// users are overreacting to this occasionally failing
|
||||||
|
if (ex.StatusCode.HasValue && ex.StatusCode.Value == HttpStatusCode.Forbidden)
|
||||||
|
{
|
||||||
|
HasUpdateAvailable = false;
|
||||||
|
return new CheckForUpdateResult
|
||||||
|
{
|
||||||
|
IsUpdateAvailable = false
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
protected virtual string UpdateTargetFileName
|
protected virtual string UpdateTargetFileName
|
||||||
{
|
{
|
||||||
|
@ -533,7 +533,7 @@ namespace Emby.Server.Implementations.HttpServer
|
|||||||
{
|
{
|
||||||
stream.Dispose();
|
stream.Dispose();
|
||||||
|
|
||||||
return GetHttpResult(new byte[] { }, contentType, true);
|
return GetHttpResult(new byte[] { }, contentType, true, responseHeaders);
|
||||||
}
|
}
|
||||||
|
|
||||||
var hasHeaders = new StreamWriter(stream, contentType, _logger)
|
var hasHeaders = new StreamWriter(stream, contentType, _logger)
|
||||||
|
@ -25,7 +25,8 @@ namespace MediaBrowser.Model.Configuration
|
|||||||
EnableThrottling = true;
|
EnableThrottling = true;
|
||||||
ThrottleDelaySeconds = 180;
|
ThrottleDelaySeconds = 180;
|
||||||
EncodingThreadCount = -1;
|
EncodingThreadCount = -1;
|
||||||
VaapiDevice = "/dev/dri/card0";
|
// This is a DRM device that is almost guaranteed to be there on every intel platform, plus it's the default one in ffmpeg if you don't specify anything
|
||||||
|
VaapiDevice = "/dev/dri/renderD128";
|
||||||
H264Crf = 23;
|
H264Crf = 23;
|
||||||
EnableHardwareEncoding = true;
|
EnableHardwareEncoding = true;
|
||||||
EnableSubtitleExtraction = true;
|
EnableSubtitleExtraction = true;
|
||||||
|
@ -26,7 +26,7 @@ namespace MediaBrowser.Server.Mono
|
|||||||
get
|
get
|
||||||
{
|
{
|
||||||
// A restart script must be provided
|
// A restart script must be provided
|
||||||
return StartupOptions.ContainsOption("-restartpath");
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user