michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2811 from MediaBrowser/dev

Browse Source 
expand on hardware decoding options
This commit is contained in:
Luke 2017-08-13 14:06:37 -04:00 committed by GitHub
commit 4c6f0bc826
5 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/Data/SqliteItemRepository.cs
View File

@ -114,7 +114,7 @@ namespace Emby.Server.Implementations.Data
{
get
{
return false;
return true;
}
}

2
Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
View File

@ -95,7 +95,7 @@ namespace Emby.Server.Implementations.Data
{
get
{
return false;
return true;
}
}

18
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@ -1846,6 +1846,24 @@ namespace MediaBrowser.Controller.MediaEncoding
return "-c:v hevc_cuvid ";
}
break;
case "mpeg2video":
if (_mediaEncoder.SupportsDecoder("mpeg2_cuvid") && encodingOptions.HardwareDecodingCodecs.Contains("mpeg2video", StringComparer.OrdinalIgnoreCase))
{
return "-c:v mpeg2_cuvid ";
}
break;
case "vc1":
if (_mediaEncoder.SupportsDecoder("vc1_cuvid") && encodingOptions.HardwareDecodingCodecs.Contains("vc1", StringComparer.OrdinalIgnoreCase))
{
return "-c:v vc1_cuvid ";
}
break;
case "mpeg4":
if (_mediaEncoder.SupportsDecoder("mpeg4_cuvid") && encodingOptions.HardwareDecodingCodecs.Contains("mpeg4", StringComparer.OrdinalIgnoreCase))
{
return "-c:v mpeg4_cuvid ";
}
break;
}
}
}

2
MediaBrowser.Providers/TV/MissingEpisodeProvider.cs
View File

@ -329,7 +329,7 @@ namespace MediaBrowser.Providers.TV
return true;
}
if (!allowMissingEpisodes && i.Episode.IsMissingEpisode)
if (!allowMissingEpisodes && i.Episode.IsMissingEpisode && !i.Episode.IsUnaired)
{
return true;
}

2
SharedVersion.cs
View File

@ -1,3 +1,3 @@
using System.Reflection;
[assembly: AssemblyVersion("3.2.26.25")]
[assembly: AssemblyVersion("3.2.26.26")]