Merge pull request #2058 from ferferga/master

Add full Raspberry Pi hardware accelerated decoding support
5 years ago · 32519a5471
parent f3ca4631c3 94ef239de0
commit 32519a5471
2 changed files with 18 additions and 2 deletions
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@ -2538,6 +2538,18 @@ namespace MediaBrowser.Controller.MediaEncoding
                                return "-c:v mpeg2_mmal ";
                            }
                            break;
+                        case "mpeg4":
+                            if (_mediaEncoder.SupportsDecoder("mpeg4_mmal") && encodingOptions.HardwareDecodingCodecs.Contains("mpeg4", StringComparer.OrdinalIgnoreCase))
+                            {
+                                return "-c:v mpeg4_mmal ";
+                            }
+                            break;
+                        case "vc1":
+                            if (_mediaEncoder.SupportsDecoder("vc1_mmal") && encodingOptions.HardwareDecodingCodecs.Contains("vc1", StringComparer.OrdinalIgnoreCase))
+                            {
+                                return "-c:v vc1_mmal ";
+                            }
+                            break;
                    }
                }

--- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
@ -18,7 +18,10 @@ namespace MediaBrowser.MediaEncoding.Encoder
            "h264_qsv",
            "hevc_qsv",
            "mpeg2_qsv",
+            "mpeg2_mmal",
+            "mpeg4_mmal",
            "vc1_qsv",
+            "vc1_mmal",
            "h264_cuvid",
            "hevc_cuvid",
            "dts",
@ -26,6 +29,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
            "aac",
            "mp3",
            "h264",
+            "h264_mmal",
            "hevc"
        };