starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-29 20:24:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

hls progress

Browse Source
This commit is contained in:
LukePulverenti
2013-03-09 10:24:38 -05:00
parent 38946150e7
commit 5591e05fdb
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

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