From 5591e05fdbe586abbde6964ed75b523732e3e573 Mon Sep 17 00:00:00 2001
From: LukePulverenti <luke.pulverenti@gmail.com>
Date: Sat, 9 Mar 2013 10:24:38 -0500
Subject: [PATCH] hls progress

---
 .../Playback/BaseStreamingService.cs          | 28 +++++++++++++++++--
 .../Playback/Hls/BaseHlsService.cs            |  6 ++--
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 178bec2b68..f22a9e09b4 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -675,10 +675,30 @@ namespace MediaBrowser.Api.Playback
             {
                 return AudioCodecs.Aac;
             }
-            if (string.Equals(ext, ".wam", StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(ext, ".wma", StringComparison.OrdinalIgnoreCase))
             {
                 return AudioCodecs.Wma;
             }
+            if (string.Equals(ext, ".ogg", StringComparison.OrdinalIgnoreCase))
+            {
+                return AudioCodecs.Vorbis;
+            }
+            if (string.Equals(ext, ".oga", StringComparison.OrdinalIgnoreCase))
+            {
+                return AudioCodecs.Vorbis;
+            }
+            if (string.Equals(ext, ".ogv", StringComparison.OrdinalIgnoreCase))
+            {
+                return AudioCodecs.Vorbis;
+            }
+            if (string.Equals(ext, ".webm", StringComparison.OrdinalIgnoreCase))
+            {
+                return AudioCodecs.Vorbis;
+            }
+            if (string.Equals(ext, ".webma", StringComparison.OrdinalIgnoreCase))
+            {
+                return AudioCodecs.Vorbis;
+            }
 
             return null;
         }
@@ -700,10 +720,14 @@ namespace MediaBrowser.Api.Playback
             {
                 return VideoCodecs.Vpx;
             }
-            if (string.Equals(ext, ".ogg", StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(ext, ".ogg", StringComparison.OrdinalIgnoreCase) || string.Equals(ext, ".ogv", StringComparison.OrdinalIgnoreCase))
             {
                 return VideoCodecs.Theora;
             }
+            if (string.Equals(ext, ".m3u8", StringComparison.OrdinalIgnoreCase) || string.Equals(ext, ".ts", StringComparison.OrdinalIgnoreCase))
+            {
+                return VideoCodecs.H264;
+            }
 
             return null;
         }
diff --git a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
index 43d98307fa..1fb8a504fb 100644
--- a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
@@ -84,12 +84,10 @@ namespace MediaBrowser.Api.Playback.Hls
             // Get the current playlist text and convert to bytes
             var playlistText = await GetPlaylistFileText(playlist, isPlaylistNewlyCreated).ConfigureAwait(false);
 
-            var content = Encoding.UTF8.GetBytes(playlistText);
-
             try
             {
                 Response.ContentType = MimeTypes.GetMimeType("playlist.m3u8");
-                return content;
+                return playlistText;
             }
             finally
             {
@@ -138,7 +136,7 @@ namespace MediaBrowser.Api.Playback.Hls
             var playlistType = fileText.IndexOf("#EXT-X-ENDLIST", StringComparison.OrdinalIgnoreCase) == -1 ? "EVENT" : "VOD";
 
             // Add event type at the top
-            fileText = fileText.Replace("#EXT-X-ALLOWCACHE", "#EXT-X-PLAYLIST-TYPE:" + playlistType + Environment.NewLine + "#EXT-X-ALLOWCACHE");
+            fileText = fileText.Replace("#EXT-X-ALLOW-CACHE", "#EXT-X-PLAYLIST-TYPE:" + playlistType + Environment.NewLine + "#EXT-X-ALLOWCACHE");
 
             return fileText;
         }