Merge pull request #82 from hudl/AddLastArgsToProcessor

ICommandProcessor changes, and new filters and defaults

Author: Casey-Bateman

Hudl.FFmpeg.Core/Command/BaseTypes/ICommandProcessor.cs

@@ -21,7 +21,12 @@ public interface ICommandProcessor
         /// contains the stdout message from the last command.
         /// </summary>
         string StdOut { get; }
-        
+
+        /// <summary>
+        /// contains the last ran Arguments through the processor
+        /// </summary>
+        string Command { get; }
+
         /// <summary>
         /// opens a command builder session, should get the processor started and ready to recieve commands
         /// </summary>

Hudl.FFmpeg.Core/Properties/AssemblyInfo.cs

@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyInformationalVersion("4.0.0")]
-[assembly: AssemblyFileVersion("4.0.0")]
-[assembly: AssemblyVersion("3.0.0.0")]
+[assembly: AssemblyInformationalVersion("5.0.0")]
+[assembly: AssemblyFileVersion("5.0.0")]
+[assembly: AssemblyVersion("5.0.0.0")]

Hudl.FFmpeg/Command/FFmpegCommandProcessor.cs

@@ -24,6 +24,7 @@ public FFmpegCommandProcessor()
         public Exception Error { get; protected set; }
 
         public string StdOut { get; protected set; }
+        public string Command { get; protected set; }
 
         public CommandProcessorStatus Status { get; protected set; }
 
@@ -94,6 +95,8 @@ public bool Send(string command, int? timeoutMilliseconds)
                 throw new ArgumentException("Processing command cannot be null or empty.", "command");
             }
 
+            Command = command; 
+
             var retryCount = 0; 
             var isSuccessful = false;
             do

Hudl.FFmpeg/Filters/Overlay.cs

@@ -25,6 +25,7 @@ public Overlay()
         {
             Format = OverlayVideoFormatType.Yuv420; 
             Eval = OverlayVideoEvalType.Frame;
+            RepeatLast = true;
         }
         public Overlay(int x, int y)
             : this()
@@ -42,7 +43,7 @@ public Overlay(int x, int y)
         [FilterParameter(Name = "shortest", Default = false, Formatter = typeof(BoolToInt32Formatter))]
         public bool Shortest { get; set; }
 
-        [FilterParameter(Name = "repeatlast", Default = false, Formatter = typeof(BoolToInt32Formatter))]
+        [FilterParameter(Name = "repeatlast", Default = true, Formatter = typeof(BoolToInt32Formatter))]
         public bool RepeatLast { get; set; }
 
         [FilterParameter(Name ="eval", Default = OverlayVideoEvalType.Frame, Formatter = typeof(EnumParameterFormatter))]

Hudl.FFmpeg/Hudl.Ffmpeg.csproj

@@ -123,6 +123,9 @@
     <Compile Include="Settings\ChannelInput.cs" />
     <Compile Include="Settings\DurationOutput.cs" />
     <Compile Include="Settings\FrameDropThreshold.cs" />
+    <Compile Include="Settings\MapChapters.cs" />
+    <Compile Include="Settings\MapMetadata.cs" />
+    <Compile Include="Settings\LogLevel.cs" />
     <Compile Include="Settings\LoopInput.cs" />
     <Compile Include="Settings\CopyTimestamps.cs" />
     <Compile Include="Settings\QualityScaleAudio.cs" />

Hudl.FFmpeg/Properties/AssemblyInfo.cs

@@ -36,6 +36,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyInformationalVersion("4.0.0")]
-[assembly: AssemblyFileVersion("4.0.0")]
-[assembly: AssemblyVersion("3.0.0.0")]
+[assembly: AssemblyInformationalVersion("5.0.0")]
+[assembly: AssemblyFileVersion("5.0.0")]
+[assembly: AssemblyVersion("5.0.0.0")]

Hudl.FFmpeg/Settings/LogLevel.cs

@@ -0,0 +1,24 @@
+using Hudl.FFmpeg.Attributes;
+using Hudl.FFmpeg.Resources.BaseTypes;
+using Hudl.FFmpeg.Settings.Attributes;
+using Hudl.FFmpeg.Settings.Interfaces;
+
+namespace Hudl.FFmpeg.Settings
+{
+    /// <summary>
+    /// set the logging level used by the target library.
+    /// </summary>
+    [ForStream(Type = typeof(AudioStream))]
+    [ForStream(Type = typeof(VideoStream))]
+    [Setting(Name = "loglevel")]
+    public class LogLevel : ISetting
+    {
+        public LogLevel(string level)
+        {
+            Level = level;
+        }
+
+        [SettingParameter]
+        public string Level { get; set; }
+    }
+}

Hudl.FFmpeg/Settings/MapChapters.cs

@@ -0,0 +1,24 @@
+using Hudl.FFmpeg.Attributes;
+using Hudl.FFmpeg.Resources.BaseTypes;
+using Hudl.FFmpeg.Settings.Attributes;
+using Hudl.FFmpeg.Settings.Interfaces;
+
+namespace Hudl.FFmpeg.Settings
+{
+    /// <summary>
+    /// copy chapters from input file with index input_file_index to the next output file..
+    /// </summary>
+    [ForStream(Type = typeof(AudioStream))]
+    [ForStream(Type = typeof(VideoStream))]
+    [Setting(Name = "map_chapters")]
+    public class MapChapters : ISetting
+    {
+        public MapChapters(string mapping)
+        {
+            Mapping = mapping;
+        }
+
+        [SettingParameter]
+        public string Mapping { get; set; }
+    }
+}

Hudl.FFmpeg/Settings/MapMetadata.cs

@@ -0,0 +1,24 @@
+using Hudl.FFmpeg.Attributes;
+using Hudl.FFmpeg.Resources.BaseTypes;
+using Hudl.FFmpeg.Settings.Attributes;
+using Hudl.FFmpeg.Settings.Interfaces;
+
+namespace Hudl.FFmpeg.Settings
+{
+    /// <summary>
+    /// set metadata information of the next output file from infile.
+    /// </summary>
+    [ForStream(Type = typeof(AudioStream))]
+    [ForStream(Type = typeof(VideoStream))]
+    [Setting(Name = "map_metadata")]
+    public class MapMetadata : ISetting
+    {
+        public MapMetadata(string mapping)
+        {
+            Mapping = mapping;
+        }
+
+        [SettingParameter]
+        public string Mapping { get; set; }
+    }
+}

Hudl.FFprobe/Command/FFprobeCommandProcessor.cs

@@ -21,6 +21,7 @@ public FFprobeCommandProcessor()
         public Exception Error { get; protected set; }
 
         public string StdOut { get; protected set; }
+        public string Command { get; protected set; }
 
         public CommandProcessorStatus Status { get; protected set; }
 
@@ -91,6 +92,8 @@ public bool Send(string command, int? timeoutMilliseconds)
                 throw new ArgumentException("Processing command cannot be null or empty.", "command");
             }
 
+            Command = command; 
+
             try
             {
                 Status = CommandProcessorStatus.Processing;