From 4fa90701fd73b811538947a844427d06afa71f6e Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 13 Apr 2017 14:57:57 -0400 Subject: [PATCH] fix incorrect level on encoding command line --- MediaBrowser.Controller/Entities/Video.cs | 2 +- MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs index 8906264191..0618fc489e 100644 --- a/MediaBrowser.Controller/Entities/Video.cs +++ b/MediaBrowser.Controller/Entities/Video.cs @@ -484,7 +484,7 @@ namespace MediaBrowser.Controller.Entities return new[] { new FileSystemMetadata { - FullName = System.IO.Path.GetDirectoryName(Path), + FullName = ContainingFolderPath, IsDirectory = true } }; diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 78e54289ea..8412985bfa 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -719,8 +719,8 @@ namespace MediaBrowser.Controller.MediaEncoding } } // nvenc doesn't decode with param -level set ?! - if (string.Equals(videoEncoder, "h264_nvenc", StringComparison.OrdinalIgnoreCase)){ - param += ""; + else if (string.Equals(videoEncoder, "h264_nvenc", StringComparison.OrdinalIgnoreCase)){ + //param += ""; } else if (!string.Equals(videoEncoder, "h264_omx", StringComparison.OrdinalIgnoreCase)) { @@ -1606,6 +1606,11 @@ namespace MediaBrowser.Controller.MediaEncoding } } + if (state.MediaSource.RequiresLooping) + { + inputModifier += " -stream_loop -1"; + } + return inputModifier; }