[chronojump] Webcam parsing on mac second fps value
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Webcam parsing on mac second fps value
- Date: Wed, 10 Jul 2019 11:49:58 +0000 (UTC)
commit b4b1842fbbe83c4917bba05a7a9c039908b632ac
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Jul 10 13:49:34 2019 +0200
Webcam parsing on mac second fps value
src/webcam/webcamFfmpegSupportedModes.cs | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/src/webcam/webcamFfmpegSupportedModes.cs b/src/webcam/webcamFfmpegSupportedModes.cs
index 95d7d888..ccc46ddb 100644
--- a/src/webcam/webcamFfmpegSupportedModes.cs
+++ b/src/webcam/webcamFfmpegSupportedModes.cs
@@ -444,8 +444,11 @@ public class WebcamFfmpegSupportedModesMac : WebcamFfmpegSupportedModes
// [avfoundation @ 0x7f849a8be800] 1280x720@[23.999981 23.999981]fps
//use: https://regex101.com/r/lZ5mN8/50
// (\d+)x(\d+)@\[(\d+).(\d+)\s+
+ // noticed that sometimes 1st fps number is 1.0000 and second is the real fps. so use
second:
+ // (\d+)x(\d+)@\[\d+.\d+\s+(\d+).(\d+)\]fps
- Match match = Regex.Match(l, @"(\d+)x(\d+)@\[(\d+).(\d+)\s+");
+ //Match match = Regex.Match(l, @"(\d+)x(\d+)@\[(\d+).(\d+)\s+");
+ Match match = Regex.Match(l, @"(\d+)x(\d+)@\[\d+.\d+\s+(\d+).(\d+)\]fps");
//TODO: use these lines
//LogB.Information("match group count: ", match.Groups.Count.ToString());
@@ -467,8 +470,14 @@ public class WebcamFfmpegSupportedModesMac : WebcamFfmpegSupportedModes
currentMode.AddFramerate(framerate);
}
- // test ParseSupportModes
+ /*
+ * test ParseSupportModes
+ * note fps can be separated by , or .
+ * but on ffmpeg/ffplay must be .
+ */
private string parseSupportedModesTestString = @"Supported modes:
+[avfoundation @ 0x7f849a8be800] 16x12@[1.000000 23.999981]fps
+[avfoundation @ 0x7f849a8be800] 16x12@[1,000000 29,970000]fps
[avfoundation @ 0x7f849a8be800] 160x120@[29.970000 29.970000]fps
[avfoundation @ 0x7f849a8be800] 160x120@[25.000000 25.000000]fps
[avfoundation @ 0x7f849a8be800] 160x120@[23.999981 23.999981]fps
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]