Merge pull request #110 from Feodoros/master

Selecting streams with the -map option 

Former-commit-id: 2d9d527b1f

FFMpegCore.Test/ArgumentBuilderTest.cs

@@ -231,6 +231,13 @@ public void Builder_BuildString_FrameOutputCount()
             Assert.AreEqual("-i \"input.mp4\" -vframes 50 \"output.mp4\"", str);
         }
 
+        [TestMethod]
+        public void Builder_BuildString_VideoStreamNumber()
+        {
+            var str = FFMpegArguments.FromFileInput("input.mp4").OutputToFile("output.mp4", false, opt => opt.SelectStream(1)).Arguments;
+            Assert.AreEqual("-i \"input.mp4\" -map 0:1 \"output.mp4\"", str);
+        }
+
         [TestMethod]
         public void Builder_BuildString_FrameRate()
         {

FFMpegCore/FFMpeg/Arguments/MapStreamArgument.cs

@@ -0,0 +1,19 @@
+namespace FFMpegCore.Arguments
+{
+    /// <summary>
+    /// Represents choice of video stream
+    /// </summary>
+    public class MapStreamArgument : IArgument
+    {
+        private readonly int _inputFileIndex;
+        private readonly int _streamIndex;
+
+        public MapStreamArgument(int streamIndex, int inputFileIndex)
+        {
+            _inputFileIndex = inputFileIndex;
+            _streamIndex = streamIndex;
+        }
+
+        public string Text => $"-map {_inputFileIndex}:{_streamIndex}";
+    }
+}

FFMpegCore/FFMpeg/FFMpeg.cs

@@ -20,15 +20,17 @@ public static class FFMpeg
         /// <param name="output">Output video file path</param>
         /// <param name="captureTime">Seek position where the thumbnail should be taken.</param>
         /// <param name="size">Thumbnail size. If width or height equal 0, the other will be computed automatically.</param>
+        /// <param name="streamIndex">Selected video stream index.</param>
+        /// <param name="inputFileIndex">Input file index</param>
         /// <returns>Bitmap with the requested snapshot.</returns>
-        public static bool Snapshot(string input, string output, Size? size = null, TimeSpan? captureTime = null)
+        public static bool Snapshot(string input, string output, Size? size = null, TimeSpan? captureTime = null, int? streamIndex = null, int inputFileIndex = 0)
         {
             if (Path.GetExtension(output) != FileExtension.Png)
                 output = Path.GetFileNameWithoutExtension(output) + FileExtension.Png;
 
             var source = FFProbe.Analyse(input);
-            var (arguments, outputOptions) = BuildSnapshotArguments(input, source, size, captureTime);
+            var (arguments, outputOptions) = BuildSnapshotArguments(input, source, size, captureTime, streamIndex, inputFileIndex);
-            
+
             return arguments
                 .OutputToFile(output, true, outputOptions)
                 .ProcessSynchronously();
@@ -40,15 +42,17 @@ public static bool Snapshot(string input, string output, Size? size = null, Time
         /// <param name="output">Output video file path</param>
         /// <param name="captureTime">Seek position where the thumbnail should be taken.</param>
         /// <param name="size">Thumbnail size. If width or height equal 0, the other will be computed automatically.</param>
+        /// <param name="streamIndex">Selected video stream index.</param>
+        /// <param name="inputFileIndex">Input file index</param>
         /// <returns>Bitmap with the requested snapshot.</returns>
-        public static async Task<bool> SnapshotAsync(string input, string output, Size? size = null, TimeSpan? captureTime = null)
+        public static async Task<bool> SnapshotAsync(string input, string output, Size? size = null, TimeSpan? captureTime = null, int? streamIndex = null, int inputFileIndex = 0)
         {
             if (Path.GetExtension(output) != FileExtension.Png)
                 output = Path.GetFileNameWithoutExtension(output) + FileExtension.Png;
 
             var source = await FFProbe.AnalyseAsync(input);
-            var (arguments, outputOptions) = BuildSnapshotArguments(input, source, size, captureTime);
+            var (arguments, outputOptions) = BuildSnapshotArguments(input, source, size, captureTime, streamIndex, inputFileIndex);
-            
+
             return await arguments
                 .OutputToFile(output, true, outputOptions)
                 .ProcessAsynchronously();
@@ -60,13 +64,15 @@ public static async Task<bool> SnapshotAsync(string input, string output, Size?
         /// <param name="input">Source video file.</param>
         /// <param name="captureTime">Seek position where the thumbnail should be taken.</param>
         /// <param name="size">Thumbnail size. If width or height equal 0, the other will be computed automatically.</param>
+        /// <param name="streamIndex">Selected video stream index.</param>
+        /// <param name="inputFileIndex">Input file index</param>
         /// <returns>Bitmap with the requested snapshot.</returns>
-        public static Bitmap Snapshot(string input, Size? size = null, TimeSpan? captureTime = null)
+        public static Bitmap Snapshot(string input, Size? size = null, TimeSpan? captureTime = null, int? streamIndex = null, int inputFileIndex = 0)
         {
             var source = FFProbe.Analyse(input);
-            var (arguments, outputOptions) = BuildSnapshotArguments(input, source, size, captureTime);
+            var (arguments, outputOptions) = BuildSnapshotArguments(input, source, size, captureTime, streamIndex, inputFileIndex);
             using var ms = new MemoryStream();
-            
+
             arguments
                 .OutputToPipe(new StreamPipeSink(ms), options => outputOptions(options
                     .ForceFormat("rawvideo")))
@@ -82,13 +88,15 @@ public static Bitmap Snapshot(string input, Size? size = null, TimeSpan? capture
         /// <param name="input">Source video file.</param>
         /// <param name="captureTime">Seek position where the thumbnail should be taken.</param>
         /// <param name="size">Thumbnail size. If width or height equal 0, the other will be computed automatically.</param>
+        /// <param name="streamIndex">Selected video stream index.</param>
+        /// <param name="inputFileIndex">Input file index</param>
         /// <returns>Bitmap with the requested snapshot.</returns>
-        public static async Task<Bitmap> SnapshotAsync(string input, Size? size = null, TimeSpan? captureTime = null)
+        public static async Task<Bitmap> SnapshotAsync(string input, Size? size = null, TimeSpan? captureTime = null, int? streamIndex = null, int inputFileIndex = 0)
         {
             var source = await FFProbe.AnalyseAsync(input);
-            var (arguments, outputOptions) = BuildSnapshotArguments(input, source, size, captureTime);
+            var (arguments, outputOptions) = BuildSnapshotArguments(input, source, size, captureTime, streamIndex, inputFileIndex);
             using var ms = new MemoryStream();
-            
+
             await arguments
                 .OutputToPipe(new StreamPipeSink(ms), options => outputOptions(options
                     .ForceFormat("rawvideo")))
@@ -98,15 +106,23 @@ await arguments
             return new Bitmap(ms);
         }
 
-        private static (FFMpegArguments, Action<FFMpegArgumentOptions> outputOptions) BuildSnapshotArguments(string input, IMediaAnalysis source, Size? size = null, TimeSpan? captureTime = null)
+        private static (FFMpegArguments, Action<FFMpegArgumentOptions> outputOptions) BuildSnapshotArguments(
+            string input,
+            IMediaAnalysis source,
+            Size? size = null,
+            TimeSpan? captureTime = null,
+            int? streamIndex = null,
+            int inputFileIndex = 0)
         {
             captureTime ??= TimeSpan.FromSeconds(source.Duration.TotalSeconds / 3);
             size = PrepareSnapshotSize(source, size);
+            streamIndex = streamIndex == null ? 0 : source.VideoStreams.FirstOrDefault(videoStream => videoStream.Index == streamIndex).Index;
 
             return (FFMpegArguments
                 .FromFileInput(input, false, options => options
-                    .Seek(captureTime)), 
+                    .Seek(captureTime)),
                 options => options
+                    .SelectStream((int)streamIndex, inputFileIndex)
                     .WithVideoCodec(VideoCodec.Png)
                     .WithFrameOutputCount(1)
                     .Resize(size));
@@ -116,11 +132,11 @@ private static (FFMpegArguments, Action<FFMpegArgumentOptions> outputOptions) Bu
         {
             if (wantedSize == null || (wantedSize.Value.Height <= 0 && wantedSize.Value.Width <= 0) || source.PrimaryVideoStream == null)
                 return null;
-            
+
             var currentSize = new Size(source.PrimaryVideoStream.Width, source.PrimaryVideoStream.Height);
             if (source.PrimaryVideoStream.Rotation == 90 || source.PrimaryVideoStream.Rotation == 180)
                 currentSize = new Size(source.PrimaryVideoStream.Height, source.PrimaryVideoStream.Width);
-            
+
             if (wantedSize.Value.Width != currentSize.Width || wantedSize.Value.Height != currentSize.Height)
             {
                 if (wantedSize.Value.Width <= 0 && wantedSize.Value.Height > 0)

FFMpegCore/FFMpeg/FFMpegArgumentOptions.cs

@@ -8,7 +8,7 @@ namespace FFMpegCore
     public class FFMpegArgumentOptions : FFMpegArgumentsBase
     {
         internal FFMpegArgumentOptions() { }
-        
+
         public FFMpegArgumentOptions WithAudioCodec(Codec audioCodec) => WithArgument(new AudioCodecArgument(audioCodec));
         public FFMpegArgumentOptions WithAudioCodec(string audioCodec) => WithArgument(new AudioCodecArgument(audioCodec));
         public FFMpegArgumentOptions WithAudioBitrate(AudioQuality audioQuality) => WithArgument(new AudioBitrateArgument(audioQuality));
@@ -17,9 +17,9 @@ internal FFMpegArgumentOptions() { }
         public FFMpegArgumentOptions WithVariableBitrate(int vbr) => WithArgument(new VariableBitRateArgument(vbr));
         public FFMpegArgumentOptions Resize(int width, int height) => WithArgument(new SizeArgument(width, height));
         public FFMpegArgumentOptions Resize(Size? size) => WithArgument(new SizeArgument(size));
-        
 
-        
+
+
         public FFMpegArgumentOptions WithBitStreamFilter(Channel channel, Filter filter) => WithArgument(new BitStreamFilterArgument(channel, filter));
         public FFMpegArgumentOptions WithConstantRateFactor(int crf) => WithArgument(new ConstantRateFactorArgument(crf));
         public FFMpegArgumentOptions CopyChannel(Channel channel = Channel.Both) => WithArgument(new CopyArgument(channel));
@@ -28,11 +28,11 @@ internal FFMpegArgumentOptions() { }
         public FFMpegArgumentOptions WithFastStart() => WithArgument(new FaststartArgument());
         public FFMpegArgumentOptions WithFrameOutputCount(int frames) => WithArgument(new FrameOutputCountArgument(frames));
         public FFMpegArgumentOptions WithHardwareAcceleration(HardwareAccelerationDevice hardwareAccelerationDevice = HardwareAccelerationDevice.Auto) => WithArgument(new HardwareAccelerationArgument(hardwareAccelerationDevice));
-        
+
         public FFMpegArgumentOptions UsingShortest(bool shortest = true) => WithArgument(new ShortestArgument(shortest));
         public FFMpegArgumentOptions UsingMultithreading(bool multithread) => WithArgument(new ThreadsArgument(multithread));
         public FFMpegArgumentOptions UsingThreads(int threads) => WithArgument(new ThreadsArgument(threads));
-        
+
         public FFMpegArgumentOptions WithVideoCodec(Codec videoCodec) => WithArgument(new VideoCodecArgument(videoCodec));
         public FFMpegArgumentOptions WithVideoCodec(string videoCodec) => WithArgument(new VideoCodecArgument(videoCodec));
         public FFMpegArgumentOptions WithVideoBitrate(int bitrate) => WithArgument(new VideoBitrateArgument(bitrate));
@@ -48,10 +48,11 @@ public FFMpegArgumentOptions WithVideoFilters(Action<VideoFilterOptions> videoFi
         public FFMpegArgumentOptions WithSpeedPreset(Speed speed) => WithArgument(new SpeedPresetArgument(speed));
         public FFMpegArgumentOptions WithStartNumber(int startNumber) => WithArgument(new StartNumberArgument(startNumber));
         public FFMpegArgumentOptions WithCustomArgument(string argument) => WithArgument(new CustomArgument(argument));
-        
+
         public FFMpegArgumentOptions Seek(TimeSpan? seekTo) => WithArgument(new SeekArgument(seekTo));
         public FFMpegArgumentOptions Loop(int times) => WithArgument(new LoopArgument(times));
         public FFMpegArgumentOptions OverwriteExisting() => WithArgument(new OverwriteArgument());
+        public FFMpegArgumentOptions SelectStream(int streamIndex, int inputFileIndex = 0) => WithArgument(new MapStreamArgument(streamIndex, inputFileIndex));
 
         public FFMpegArgumentOptions ForceFormat(ContainerFormat format) => WithArgument(new ForceFormatArgument(format));
         public FFMpegArgumentOptions ForceFormat(string format) => WithArgument(new ForceFormatArgument(format));