aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/Playback/BaseStreamingService.cs
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Api/Playback/BaseStreamingService.cs')
-rw-r--r--MediaBrowser.Api/Playback/BaseStreamingService.cs28
1 files changed, 26 insertions, 2 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 178bec2b6..f22a9e09b 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;
}