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

update shared stream support

Browse Source
This commit is contained in:
Luke Pulverenti 2017-11-18 23:59:34 -05:00
parent 61dcc42e80
commit 43cb11f694
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
View File

@ -65,8 +65,11 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
var requiresRemux = false; var requiresRemux = false;
var contentType = response.ContentType ?? string.Empty; var contentType = response.ContentType ?? string.Empty;
if (contentType.IndexOf("mp4", StringComparison.OrdinalIgnoreCase) != -1 || if (contentType.IndexOf("matroska", StringComparison.OrdinalIgnoreCase) != -1)
contentType.IndexOf("matroska", StringComparison.OrdinalIgnoreCase) != -1 || {
extension = "mkv";
}
else if (contentType.IndexOf("mp4", StringComparison.OrdinalIgnoreCase) != -1 ||
contentType.IndexOf("dash", StringComparison.OrdinalIgnoreCase) != -1 || contentType.IndexOf("dash", StringComparison.OrdinalIgnoreCase) != -1 ||
contentType.IndexOf("mpegURL", StringComparison.OrdinalIgnoreCase) != -1) contentType.IndexOf("mpegURL", StringComparison.OrdinalIgnoreCase) != -1)
{ {

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

@ -1335,19 +1335,15 @@ namespace MediaBrowser.Model.Dlna
return true; return true;
} }
if (!maxBitrate.HasValue) var requestedMaxBitrate = maxBitrate ?? 1000000;
{
_logger.Info("Cannot " + playMethod + " due to unknown supported bitrate");
return false;
}
// If we don't know the bitrate, then force a transcode if requested max bitrate is under 40 mbps // If we don't know the bitrate, then force a transcode if requested max bitrate is under 40 mbps
var itemBitrate = item.Bitrate ?? var itemBitrate = item.Bitrate ??
40000000; 40000000;
if (itemBitrate > maxBitrate.Value) if (itemBitrate > requestedMaxBitrate)
{ {
_logger.Info("Bitrate exceeds " + playMethod + " limit: media bitrate: {0}, max bitrate: {1}", item.Bitrate.Value.ToString(CultureInfo.InvariantCulture), maxBitrate.Value.ToString(CultureInfo.InvariantCulture)); _logger.Info("Bitrate exceeds " + playMethod + " limit: media bitrate: {0}, max bitrate: {1}", item.Bitrate.Value.ToString(CultureInfo.InvariantCulture), requestedMaxBitrate.ToString(CultureInfo.InvariantCulture));
return false; return false;
} }