aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Dto
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-04-22 13:25:54 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-04-22 13:25:54 -0400
commit54eb7cb85537ef6959e3f1fab7871361b9bf8243 (patch)
tree581c3f120c09c0acc2856c5fc684d00c467e5aa8 /MediaBrowser.Server.Implementations/Dto
parent4331700747440cfa2c2df0cea1abcace9ed60019 (diff)
update dlna profiles
Diffstat (limited to 'MediaBrowser.Server.Implementations/Dto')
-rw-r--r--MediaBrowser.Server.Implementations/Dto/DtoService.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index 166d26b3c6..d32e6ad0e5 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -1252,7 +1252,10 @@ namespace MediaBrowser.Server.Implementations.Dto
}
}
- var bitrate = info.MediaStreams.Where(m => m.Type == MediaStreamType.Audio || m.Type == MediaStreamType.Video).Select(m => m.BitRate ?? 0).Sum();
+ var bitrate = i.TotalBitrate ??
+ info.MediaStreams.Where(m => m.Type != MediaStreamType.Subtitle && !string.Equals(m.Codec, "mjpeg", StringComparison.OrdinalIgnoreCase))
+ .Select(m => m.BitRate ?? 0)
+ .Sum();
if (bitrate > 0)
{
@@ -1286,7 +1289,10 @@ namespace MediaBrowser.Server.Implementations.Dto
}
}
- var bitrate = info.MediaStreams.Where(m => m.Type == MediaStreamType.Audio).Select(m => m.BitRate ?? 0).Sum();
+ var bitrate = i.TotalBitrate ??
+ info.MediaStreams.Where(m => m.Type == MediaStreamType.Audio)
+ .Select(m => m.BitRate ?? 0)
+ .Sum();
if (bitrate > 0)
{