diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-09-15 13:59:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-15 13:59:17 -0400 |
| commit | 930ce927b06fb481e1201a66251b4fe652e1f12b (patch) | |
| tree | dfbdc1f04a9f540797ebe965af444622e5ab25aa /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | 7b921391739f5ea8ac7436873703e2106638cfc5 (diff) | |
| parent | f3096b83403d6ad8f5a087d46d04d889f96740a7 (diff) | |
Merge pull request #2883 from MediaBrowser/dev
add omx decoder
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 58208734b..1060dc8de 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -56,7 +56,7 @@ namespace MediaBrowser.Controller.MediaEncoding { 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); } @@ -1896,6 +1896,20 @@ namespace MediaBrowser.Controller.MediaEncoding 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 |