alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-30 19:32:57 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

3.0.5231.40980

Browse Source
This commit is contained in:
Luke Pulverenti
2014-04-28 23:56:20 -04:00
parent 0f4c28c120
commit e9fb806478
38 changed files with 1197 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.Model/Dlna/ConditionProcessor.cs
View File

@@ -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:

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

@@ -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;
}