alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-18 21:50:25 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

3.0.5324.37963

Browse Source
This commit is contained in:
Luke Pulverenti
2014-07-30 22:09:23 -04:00
parent 51e964dae3
commit a37a11c486
21 changed files with 196 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
View File

@@ -92,7 +92,7 @@ namespace MediaBrowser.Model.Dlna
return (contentFeatures + orgOp + orgCi + dlnaflags).Trim(';');
}
public string BuildVideoHeader(string container,
public List<string> BuildVideoHeader(string container,
string videoCodec,
string audioCodec,
int? width,
@@ -149,30 +149,42 @@ namespace MediaBrowser.Model.Dlna
timestamp,
isAnamorphic);
string orgPn = mediaProfile == null ? null : mediaProfile.OrgPn;
List<string> orgPnValues = new List<string>();
if (string.IsNullOrEmpty(orgPn))
if (mediaProfile != null && !string.IsNullOrEmpty(mediaProfile.OrgPn))
{
orgPnValues.Add(mediaProfile.OrgPn);
}
else
{
foreach (string s in GetVideoOrgPnValue(container, videoCodec, audioCodec, width, height, timestamp))
{
orgPn = s;
orgPnValues.Add(s);
break;
}
}
if (string.IsNullOrEmpty(orgPn))
List<string> contentFeatureList = new List<string>();
foreach (string orgPn in orgPnValues)
{
// TODO: Support multiple values and return multiple headers?
foreach (string s in (orgPn ?? string.Empty).Split(','))
{
orgPn = s;
break;
}
string contentFeatures = string.IsNullOrEmpty(orgPn) ? string.Empty : "DLNA.ORG_PN=" + orgPn;
var value = (contentFeatures + orgOp + orgCi + dlnaflags).Trim(';');
contentFeatureList.Add(value);
}
string contentFeatures = string.IsNullOrEmpty(orgPn) ? string.Empty : "DLNA.ORG_PN=" + orgPn;
if (orgPnValues.Count == 0)
{
string contentFeatures = string.Empty;
return (contentFeatures + orgOp + orgCi + dlnaflags).Trim(';');
var value = (contentFeatures + orgOp + orgCi + dlnaflags).Trim(';');
contentFeatureList.Add(value);
}
return contentFeatureList;
}
private string GetImageOrgPnValue(string container, int? width, int? height)