[vlc-commits] v4l2: temporarily remove broken bottom field first flag

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Mar 16 22:29:03 2012 +0200| [caa43042915f7f9eb750454d590e9688e6c01df0] | committer: Rémi Denis-Courmont

v4l2: temporarily remove broken bottom field first flag

This should be set for all NTSC standard variants, not only for the
whole set of NTSC standards. More importantly, this should used the
detected standard (VIDIOC_QUERYSTD) rather than the configured one
(VIDIOC_S_STD) if at all possible.

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

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

diff --git a/modules/access/v4l2/video.c b/modules/access/v4l2/video.c
index c59bfdb..470a44a 100644
--- a/modules/access/v4l2/video.c
+++ b/modules/access/v4l2/video.c
@@ -1004,7 +1004,6 @@ int InitVideo( vlc_object_t *p_obj, int i_fd, demux_sys_t *p_sys,
     msg_Dbg( p_obj, "input set to %u", index );
 
     /* Select standard */
-    bool bottom_first;
     const char *stdname = var_InheritString( p_obj, CFG_PREFIX"standard" );
     if( stdname != NULL )
     {
@@ -1035,10 +1034,7 @@ int InitVideo( vlc_object_t *p_obj, int i_fd, demux_sys_t *p_sys,
             return -1;
         }
         msg_Dbg( p_obj, "standard set to 0x%"PRIx64":", std );
-        bottom_first = std == V4L2_STD_NTSC;
     }
-    else
-        bottom_first = false;
 
     SetupAudio (p_obj, i_fd, &input);
     SetupTuner (p_obj, i_fd, &input);
@@ -1285,9 +1281,9 @@ int InitVideo( vlc_object_t *p_obj, int i_fd, demux_sys_t *p_sys,
             break;
         case V4L2_FIELD_INTERLACED:
             msg_Dbg( p_obj, "Interlacing setting: interleaved (bottom top if M/NTSC, top bottom otherwise)" );
-            if( bottom_first )
+            /*if (NTSC)
                 p_sys->i_block_flags = BLOCK_FLAG_BOTTOM_FIELD_FIRST;
-            else
+            else*/
                 p_sys->i_block_flags = BLOCK_FLAG_TOP_FIELD_FIRST;
             break;
         case V4L2_FIELD_SEQ_TB: