Przeglądaj źródła

quote ffmpeg params

Luke Pulverenti 9 lat temu
rodzic
commit
7daf34f048

+ 3 - 3
MediaBrowser.Api/Playback/Progressive/VideoService.cs

@@ -149,11 +149,11 @@ namespace MediaBrowser.Api.Playback.Progressive
                 {
                 {
                     args += " -copyts -avoid_negative_ts disabled -start_at_zero";
                     args += " -copyts -avoid_negative_ts disabled -start_at_zero";
                 }
                 }
-                
+
                 return args;
                 return args;
             }
             }
 
 
-            var keyFrameArg = string.Format(" -force_key_frames expr:gte(t,n_forced*{0})",
+            var keyFrameArg = string.Format(" -force_key_frames \"expr:gte(t,n_forced*{0})\"",
                 5.ToString(UsCulture));
                 5.ToString(UsCulture));
 
 
             args += keyFrameArg;
             args += keyFrameArg;
@@ -237,4 +237,4 @@ namespace MediaBrowser.Api.Playback.Progressive
             return args;
             return args;
         }
         }
     }
     }
-}
+}

+ 2 - 1
MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs

@@ -87,6 +87,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 "h264_nvenc",
                 "h264_nvenc",
                 "h264_qsv",
                 "h264_qsv",
                 "h264_omx",
                 "h264_omx",
+                "h264_vaapi",
                 "ac3"
                 "ac3"
             };
             };
 
 
@@ -156,4 +157,4 @@ namespace MediaBrowser.MediaEncoding.Encoder
             }
             }
         }
         }
     }
     }
-}
+}

+ 2 - 2
MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs

@@ -84,7 +84,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 return args;
                 return args;
             }
             }
 
 
-            var keyFrameArg = string.Format(" -force_key_frames expr:gte(t,n_forced*{0})",
+            var keyFrameArg = string.Format(" -force_key_frames \"expr:gte(t,n_forced*{0})\"",
                 5.ToString(UsCulture));
                 5.ToString(UsCulture));
 
 
             args += keyFrameArg;
             args += keyFrameArg;
@@ -192,4 +192,4 @@ namespace MediaBrowser.MediaEncoding.Encoder
             get { return true; }
             get { return true; }
         }
         }
     }
     }
-}
+}

+ 2 - 2
MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs

@@ -191,7 +191,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             {
             {
                 var maxBitrate = 25000000;
                 var maxBitrate = 25000000;
                 videoArgs = string.Format(
                 videoArgs = string.Format(
-                        "-codec:v:0 libx264 -force_key_frames expr:gte(t,n_forced*5) {0} -pix_fmt yuv420p -preset superfast -crf 23 -b:v {1} -maxrate {1} -bufsize ({1}*2) -vsync -1 -profile:v high -level 41",
+                        "-codec:v:0 libx264 -force_key_frames \"expr:gte(t,n_forced*5)\" {0} -pix_fmt yuv420p -preset superfast -crf 23 -b:v {1} -maxrate {1} -bufsize ({1}*2) -vsync -1 -profile:v high -level 41",
                         GetOutputSizeParam(),
                         GetOutputSizeParam(),
                         maxBitrate.ToString(CultureInfo.InvariantCulture));
                         maxBitrate.ToString(CultureInfo.InvariantCulture));
             }
             }
@@ -354,4 +354,4 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             }
             }
         }
         }
     }
     }
-}
+}