[chronojump] Webcam: pixel format for capture on Linux and Windows

[Xavier de Blas <xaviblas src gnome org>]

commit 135d57a9e45c6b8c523da0ca27ae7669c2d7b1c2
Author: Xavier de Blas <xaviblas gmail com>
Date:   Thu Jul 11 13:34:48 2019 +0200

    Webcam: pixel format for capture on Linux and Windows

 src/webcam/webcamFfmpeg.cs | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/src/webcam/webcamFfmpeg.cs b/src/webcam/webcamFfmpeg.cs
index dc1c2e8d..3a842e92 100644
--- a/src/webcam/webcamFfmpeg.cs
+++ b/src/webcam/webcamFfmpeg.cs
@@ -232,12 +232,15 @@ public class WebcamFfmpeg : Webcam
                else
                        parameters.Insert (i ++, "640x480");
 
-               if(videoDevicePixelFormat != "" && os == UtilAll.OperatingSystems.LINUX) {
-                       parameters.Insert (i ++, "-input_format");
-                       parameters.Insert (i ++, videoDevicePixelFormat);
-               } else if(videoDevicePixelFormat != "" && os == UtilAll.OperatingSystems.WINDOWS) {
-                       parameters.Insert (i ++, "-pixel_format");
-                       parameters.Insert (i ++, videoDevicePixelFormat);
+               if(videoDevicePixelFormat != "")
+               {
+                       if(os == UtilAll.OperatingSystems.LINUX) {
+                               parameters.Insert (i ++, "-input_format");
+                               parameters.Insert (i ++, videoDevicePixelFormat);
+                       } else if(os == UtilAll.OperatingSystems.WINDOWS) {
+                               parameters.Insert (i ++, "-pixel_format");
+                               parameters.Insert (i ++, videoDevicePixelFormat);
+                       }
                }
 
                if(os == UtilAll.OperatingSystems.LINUX)
@@ -339,12 +342,16 @@ public class WebcamFfmpeg : Webcam
                else
                        parameters.Insert (i ++, "640x480");
 
-               /* Disabled until we do not detect wich formats are available on the device
-               if(os == UtilAll.OperatingSystems.LINUX) {
-                       parameters.Insert (i ++, "-input_format");
-                       parameters.Insert (i ++, "mjpeg");
+               if(videoDevicePixelFormat != "")
+               {
+                       if(os == UtilAll.OperatingSystems.LINUX) {
+                               parameters.Insert (i ++, "-input_format");
+                               parameters.Insert (i ++, videoDevicePixelFormat);
+                       } else if(os == UtilAll.OperatingSystems.WINDOWS) {
+                               parameters.Insert (i ++, "-pixel_format");
+                               parameters.Insert (i ++, videoDevicePixelFormat);
+                       }
                }
-               */
 
                parameters.Insert (i ++, "-i");
                if(os == UtilAll.OperatingSystems.LINUX)