aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-04-13 16:57:00 -0400
committerLuke <luke.pulverenti@gmail.com>2016-04-13 16:57:00 -0400
commitd63e68d356a26106cdc617d2b2d385805154aeae (patch)
tree5271042a52de8c0b70f59afcf7a8bf6ff5de4139 /MediaBrowser.Model
parentc72561176be3e6c07f8174deb3287613add2bb05 (diff)
parentb0379ec7f8fb4804f76d64264a4b35b65debedc6 (diff)
Merge pull request #1647 from MediaBrowser/dev
fix tabs
Diffstat (limited to 'MediaBrowser.Model')
-rw-r--r--MediaBrowser.Model/Dlna/StreamBuilder.cs22
1 files changed, 17 insertions, 5 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 6bb2a9f82..09d762aae 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -520,7 +520,7 @@ namespace MediaBrowser.Model.Dlna
{
if (StringHelper.EqualsIgnoreCase(targetAudioCodec, "ac3"))
{
- defaultBitrate = 384000;
+ defaultBitrate = 448000;
}
else
{
@@ -840,13 +840,25 @@ namespace MediaBrowser.Model.Dlna
private bool IsAudioEligibleForDirectPlay(MediaSourceInfo item, int? maxBitrate)
{
- if (!maxBitrate.HasValue || (item.Bitrate.HasValue && item.Bitrate.Value <= maxBitrate.Value))
+ if (!maxBitrate.HasValue)
{
- return true;
+ _logger.Info("Cannot direct play due to unknown supported bitrate");
+ return false;
}
- _logger.Info("Bitrate exceeds DirectPlay limit");
- return false;
+ if (!item.Bitrate.HasValue)
+ {
+ _logger.Info("Cannot direct play due to unknown content bitrate");
+ return false;
+ }
+
+ if (item.Bitrate.Value > maxBitrate.Value)
+ {
+ _logger.Info("Bitrate exceeds DirectPlay limit");
+ return false;
+ }
+
+ return true;
}
private void ValidateInput(VideoOptions options)