瀏覽代碼

fix incorrect level on encoding command line

Luke Pulverenti 8 年之前
父節點
當前提交
4fa90701fd
共有 2 個文件被更改,包括 8 次插入3 次删除
  1. 1 1
      MediaBrowser.Controller/Entities/Video.cs
  2. 7 2
      MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

+ 1 - 1
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
                     }
                 };

+ 7 - 2
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;
         }