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

Merge pull request #2883 from MediaBrowser/dev

Browse Source 
add omx decoder
This commit is contained in:
Luke 2017-09-15 13:59:17 -04:00 committed by GitHub
commit 930ce927b0
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
View File

@ -173,7 +173,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
} }
} }
logger.Debug("{0} is not a series folder.", path); //logger.Debug("{0} is not a series folder.", path);
return false; return false;
} }

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

@ -56,7 +56,7 @@ namespace MediaBrowser.Controller.MediaEncoding
{ {
return GetAvailableEncoder("h264_nvenc", defaultEncoder); return GetAvailableEncoder("h264_nvenc", defaultEncoder);
} }
if (string.Equals(hwType, "h264_omx", StringComparison.OrdinalIgnoreCase)) if (string.Equals(hwType, "omx", StringComparison.OrdinalIgnoreCase))
{ {
return GetAvailableEncoder("h264_omx", defaultEncoder); return GetAvailableEncoder("h264_omx", defaultEncoder);
} }
@ -1896,6 +1896,20 @@ namespace MediaBrowser.Controller.MediaEncoding
break; break;
} }
} }
else if (string.Equals(encodingOptions.HardwareAccelerationType, "omx", StringComparison.OrdinalIgnoreCase))
{
switch (videoStream.Codec.ToLower())
{
case "avc":
case "h264":
if (_mediaEncoder.SupportsDecoder("h264_omx") && encodingOptions.HardwareDecodingCodecs.Contains("h264", StringComparer.OrdinalIgnoreCase))
{
return "-c:v h264_omx ";
}
break;
}
}
} }
// leave blank so ffmpeg will decide // leave blank so ffmpeg will decide

2
SharedVersion.cs
View File

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