aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author7illusions <z@7illusions.com>2014-02-05 07:51:28 +0100
committer7illusions <z@7illusions.com>2014-02-05 07:51:28 +0100
commit890b011f5e5d6790eeaf5901f9919c758f2d6b6b (patch)
treed727afb8b04d867b385becb0ff28f03823bf3991
parent351cfef7a70ef311801be0bc9eb9e3891265d22b (diff)
Update BaseProgressiveStreamingService.cs
Added contentFeatures for mkv and mp4
-rw-r--r--MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
index 7924b57d8..708e85d4d 100644
--- a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
@@ -136,10 +136,14 @@ namespace MediaBrowser.Api.Playback.Progressive
{
contentFeatures = "DLNA.ORG_PN=AVI";
}
- //else if (string.Equals(extension, ".mp4", StringComparison.OrdinalIgnoreCase))
- //{
- // contentFeatures = "DLNA.ORG_PN=MPEG4_P2_SP_AAC";
- //}
+ else if (string.Equals(extension, ".mkv", StringComparison.OrdinalIgnoreCase))
+ {
+ contentFeatures = "DLNA.ORG_PN=MATROSKA";
+ }
+ else if (string.Equals(extension, ".mp4", StringComparison.OrdinalIgnoreCase))
+ {
+ contentFeatures = "DLNA.ORG_PN=AVC_MP4_MP_HD_720p_AAC";
+ }
//else if (string.Equals(extension, ".mpeg", StringComparison.OrdinalIgnoreCase))
//{
// contentFeatures = "DLNA.ORG_PN=MPEG_PS_PAL";
@@ -153,11 +157,7 @@ namespace MediaBrowser.Api.Playback.Progressive
// // ??
// contentFeatures = "DLNA.ORG_PN=WMVHIGH_BASE";
//}
- //else if (string.Equals(extension, ".mkv", StringComparison.OrdinalIgnoreCase))
- //{
- // // ??
- // contentFeatures = "";
- //}
+
if (!string.IsNullOrEmpty(contentFeatures))
{