[chronojump] webcam: Updated forgotten parameters for mac
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] webcam: Updated forgotten parameters for mac
- Date: Mon, 8 Apr 2019 10:58:12 +0000 (UTC)
commit 62e7e0bd6b56ae8909908591827c06881c4ba803
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Apr 8 12:57:39 2019 +0200
webcam: Updated forgotten parameters for mac
src/webcamFfmpeg.cs | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 44 insertions(+), 8 deletions(-)
---
diff --git a/src/webcamFfmpeg.cs b/src/webcamFfmpeg.cs
index 3957ea60..e6330b7c 100644
--- a/src/webcamFfmpeg.cs
+++ b/src/webcamFfmpeg.cs
@@ -176,13 +176,31 @@ public class WebcamFfmpeg : Webcam
parameters.Insert (i ++, "-f");
if(os == UtilAll.OperatingSystems.LINUX)
parameters.Insert (i ++, "v4l2");
- else //windows
+ else if (os == UtilAll.OperatingSystems.WINDOWS)
parameters.Insert (i ++, "dshow");
+ else //mac
+ parameters.Insert (i ++, "avfoundation");
+
+ parameters.Insert (i ++, "-framerate");
+ if(videoDeviceFramerate != "" && Util.IsNumber(videoDeviceFramerate, false))
+ parameters.Insert (i ++, videoDeviceFramerate);
+ else
+ parameters.Insert (i ++, "30");
+
+ parameters.Insert (i ++, "-video_size");
+ if(videoDeviceResolution != "")
+ parameters.Insert (i ++, videoDeviceResolution);
+ else
+ parameters.Insert (i ++, "640x480");
if(os == UtilAll.OperatingSystems.LINUX)
parameters.Insert (i ++, videoDevice);
- else
+ else if (os == UtilAll.OperatingSystems.WINDOWS)
parameters.Insert (i ++, "video=" + videoDevice);
+ else { //mac
+ parameters.Insert (i ++, "-i");
+ parameters.Insert (i ++, videoDevice);
+ }
parameters.Insert (i++, "-exitonkeydown");
parameters.Insert (i++, "-exitonmousedown");
@@ -201,8 +219,10 @@ public class WebcamFfmpeg : Webcam
parameters.Insert (i ++, "-f");
if(os == UtilAll.OperatingSystems.LINUX)
parameters.Insert (i ++, "v4l2");
- else //windows
+ else if (os == UtilAll.OperatingSystems.WINDOWS)
parameters.Insert (i ++, "dshow");
+ else //mac
+ parameters.Insert (i ++, "avfoundation");
parameters.Insert (i ++, "-s");
parameters.Insert (i ++, "400x400");
@@ -210,8 +230,12 @@ public class WebcamFfmpeg : Webcam
parameters.Insert (i ++, "-i");
if(os == UtilAll.OperatingSystems.LINUX)
parameters.Insert (i ++, videoDevice);
- else
+ else if (os == UtilAll.OperatingSystems.WINDOWS)
parameters.Insert (i ++, "video=" + videoDevice);
+ else { //mac
+ parameters.Insert (i ++, "-i");
+ parameters.Insert (i ++, videoDevice);
+ }
parameters.Insert (i ++, "-ss");
parameters.Insert (i ++, "0:0:2");
@@ -242,8 +266,10 @@ public class WebcamFfmpeg : Webcam
parameters.Insert (i ++, "-f");
if(os == UtilAll.OperatingSystems.LINUX)
parameters.Insert (i ++, "v4l2");
- else //windows
+ else if (os == UtilAll.OperatingSystems.WINDOWS)
parameters.Insert (i ++, "dshow");
+ else //mac
+ parameters.Insert (i ++, "avfoundation");
parameters.Insert (i ++, "-framerate");
if(videoDeviceFramerate != "" && Util.IsNumber(videoDeviceFramerate, false))
@@ -265,8 +291,12 @@ public class WebcamFfmpeg : Webcam
parameters.Insert (i ++, "-i");
if(os == UtilAll.OperatingSystems.LINUX)
parameters.Insert (i ++, videoDevice);
- else //windows
+ else if (os == UtilAll.OperatingSystems.WINDOWS)
parameters.Insert (i ++, "video=" + videoDevice);
+ else { //mac
+ parameters.Insert (i ++, "-i");
+ parameters.Insert (i ++, videoDevice);
+ }
parameters.Insert (i ++, Util.GetVideoTempFileName());
@@ -286,14 +316,20 @@ public class WebcamFfmpeg : Webcam
parameters.Insert (i ++, "-f");
if(os == UtilAll.OperatingSystems.LINUX)
parameters.Insert (i ++, "v4l2");
- else //windows
+ else if (os == UtilAll.OperatingSystems.WINDOWS)
parameters.Insert (i ++, "dshow");
+ else //mac
+ parameters.Insert (i ++, "avfoundation");
parameters.Insert (i ++, "-i");
if(os == UtilAll.OperatingSystems.LINUX)
parameters.Insert (i ++, videoDevice);
- else //windows
+ else if (os == UtilAll.OperatingSystems.WINDOWS)
parameters.Insert (i ++, "video=" + videoDevice);
+ else { //mac
+ parameters.Insert (i ++, "-i");
+ parameters.Insert (i ++, videoDevice);
+ }
parameters.Insert (i ++, "-map");
parameters.Insert (i ++, "0");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]