aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model/Dlna
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-04-28 23:56:20 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-04-28 23:56:20 -0400
commite9fb806478e974b200b54f8acff5eb09bdef4c32 (patch)
tree6b83c4728d93eb4bc26331d946f500243f5a1f24 /MediaBrowser.Model/Dlna
parent0f4c28c120751e1cf6e0562ef0445c7fa46cf0a4 (diff)
3.0.5231.40980
Diffstat (limited to 'MediaBrowser.Model/Dlna')
-rw-r--r--MediaBrowser.Model/Dlna/ConditionProcessor.cs11
-rw-r--r--MediaBrowser.Model/Dlna/StreamBuilder.cs4
2 files changed, 8 insertions, 7 deletions
diff --git a/MediaBrowser.Model/Dlna/ConditionProcessor.cs b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
index d5e1f6686f..27c4850e8c 100644
--- a/MediaBrowser.Model/Dlna/ConditionProcessor.cs
+++ b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
@@ -1,7 +1,6 @@
-using System;
+using MediaBrowser.Model.MediaInfo;
+using System;
using System.Globalization;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.MediaInfo;
namespace MediaBrowser.Model.Dlna
{
@@ -83,13 +82,13 @@ namespace MediaBrowser.Model.Dlna
public bool IsVideoAudioConditionSatisfied(ProfileCondition condition,
int? audioChannels,
- int? audioBitrate)
+ int? audioBitrate,
+ string audioProfile)
{
switch (condition.Property)
{
case ProfileConditionValue.AudioProfile:
- // TODO: Implement
- return true;
+ return IsConditionSatisfied(condition, audioProfile);
case ProfileConditionValue.AudioBitrate:
return IsConditionSatisfied(condition, audioBitrate);
case ProfileConditionValue.AudioChannels:
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 40b1e140b1..79aeda2e63 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -285,6 +285,7 @@ namespace MediaBrowser.Model.Dlna
var audioBitrate = audioStream == null ? null : audioStream.BitRate;
var audioChannels = audioStream == null ? null : audioStream.Channels;
+ var audioProfile = audioStream == null ? null : audioStream.Profile;
var timestamp = videoStream == null ? TransportStreamTimestamp.None : mediaSource.Timestamp;
var packetLength = videoStream == null ? null : videoStream.PacketLength;
@@ -348,7 +349,8 @@ namespace MediaBrowser.Model.Dlna
if (!conditions.All(i => conditionProcessor.IsVideoAudioConditionSatisfied(i,
audioChannels,
- audioBitrate)))
+ audioBitrate,
+ audioProfile)))
{
return null;
}