[vlc-commits] v4l2: add automatic power line frequency detection

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Jan  6 12:31:45 2012 +0200| [f4816ca7653df5161eb8f368722ae50d6e4202b4] | committer: Rémi Denis-Courmont

v4l2: add automatic power line frequency detection

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f4816ca7653df5161eb8f368722ae50d6e4202b4
---

 modules/access/v4l2/v4l2.h  |    1 +
 modules/access/v4l2/video.c |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/modules/access/v4l2/v4l2.h b/modules/access/v4l2/v4l2.h
index 6cdef4e..7e11709 100644
--- a/modules/access/v4l2/v4l2.h
+++ b/modules/access/v4l2/v4l2.h
@@ -32,6 +32,7 @@
 #ifndef V4L2_CTRL_FLAG_VOLATILE /* 3.2 */
 # warning Please update Video4Linux2 headers!
 # define V4L2_CTRL_FLAG_VOLATILE 0x0080
+# define V4L2_CID_POWER_LINE_FREQUENCY_AUTO 3
 # define V4L2_STD_G (V4L2_STD_PAL_G|V4L2_STD_SECAM_G)
 # define V4L2_STD_H (V4L2_STD_PAL_H|V4L2_STD_SECAM_H)
 # define V4L2_STD_L (V4L2_STD_SECAM_L|V4L2_STD_SECAM_LC)
diff --git a/modules/access/v4l2/video.c b/modules/access/v4l2/video.c
index 9c31f3f..f1db053 100644
--- a/modules/access/v4l2/video.c
+++ b/modules/access/v4l2/video.c
@@ -140,9 +140,10 @@ static const int power_freq_vlc[] = { -1,
     V4L2_CID_POWER_LINE_FREQUENCY_DISABLED,
     V4L2_CID_POWER_LINE_FREQUENCY_50HZ,
     V4L2_CID_POWER_LINE_FREQUENCY_60HZ,
+    V4L2_CID_POWER_LINE_FREQUENCY_AUTO,
 };
 static const char *const power_freq_user[] = { N_("Unspecified"),
-    N_("Off"), N_("50 Hz"), N_("60 Hz"),
+    N_("Off"), N_("50 Hz"), N_("60 Hz"), N_("Automatic"),
 };
 #define BKLT_COMPENSATE_TEXT N_( "Backlight compensation" )
 #define BKLT_COMPENSATE_LONGTEXT N_( "Backlight compensation." )