Changeset aa98c569277c489e7796e857e56f4fad15b0d00c

Timestamp:

13/09/08 23:47:15 (3 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1221342435 +0200

git-parent:

[f93b233d65ebe77ab284d978253e68baf0e02550]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1221341962 +0200

Message:

Fixed the RGB masks in v4l2.

Thanks a lot to plc5_250 on IRC for testing.

Files:

• modules/access/v4l2/v4l2.c (modified) (6 diffs)

modules/access/v4l2/v4l2.c

@@ -440 +440 @@
-    unsigned int i_v4l2;
-    int i_fourcc;
+    int i_rmask;
+    int i_gmask;
+    int i_bmask;
-} v4l2chroma_to_fourcc[] =
-{
-    /* Raw data types */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /* Raw data types, not in V4L2 spec but still in videodev2.h and supported
-     * by VLC */
-
+, 0, 0, 0
-    /* FIXME { V4L2_PIX_FMT_RGB444,  VLC_FOURCC('R','V','3','2') }, */
-
-    /* Compressed data types */
-
+, 0, 0, 0
-#if 0
-    { V4L2_PIX_FMT_JPEG,    VLC_FOURCC('J','P','E','G') },
@@ -470 +480 @@
-    { V4L2_PIX_FMT_MPEG,    VLC_FOURCC('?','?','?','?') },
-#endif
-
+, 0, 0, 0
-};
-
@@ -476 +486 @@
- * List of V4L2 chromas were confident enough to use as fallbacks if the
- * user hasn't provided a --v4l2-chroma value.
+ *
+ * Try YUV chromas first, then RGB little endian and MJPEG as last resort.
- */
-static const __u32 p_chroma_fallbacks[] =
-{ V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_YVU420, V4L2_PIX_FMT_YUV422P,
-
+
+
-
-static const struct
@@ -1817 +1830 @@
-    enum v4l2_buf_type buf_type;
-    char *psz_device = p_sys->psz_vdev;
+    es_format_t es_fmt;
-
-    if( ( i_fd = open( psz_device, O_RDWR ) ) < 0 )
@@ -2055 +2069 @@
-        {
-            p_sys->i_fourcc = v4l2chroma_to_fourcc[i].i_fourcc;
+            es_format_Init( &es_fmt, VIDEO_ES, p_sys->i_fourcc );
+            es_fmt.video.i_rmask = v4l2chroma_to_fourcc[i].i_rmask;
+            es_fmt.video.i_gmask = v4l2chroma_to_fourcc[i].i_gmask;
+            es_fmt.video.i_bmask = v4l2chroma_to_fourcc[i].i_bmask;
-            break;
-        }
@@ -2132 +2150 @@
-
-    /* Add */
-    es_format_t es_fmt;
-    es_format_Init( &es_fmt, VIDEO_ES, p_sys->i_fourcc );
-    es_fmt.video.i_width  = p_sys->i_width;
-    es_fmt.video.i_height = p_sys->i_height;
-    es_fmt.video.i_aspect = 4 * VOUT_ASPECT_FACTOR / 3;
-
-    /* Setup rgb mask for RGB formats */
-    if( p_sys->i_fourcc == VLC_FOURCC( 'R','V','2','4' ) )
-    {
-        /* This is in BGR format */
-        es_fmt.video.i_bmask = 0x00ff0000;
-        es_fmt.video.i_gmask = 0x0000ff00;
-        es_fmt.video.i_rmask = 0x000000ff;
-    }
-
-    msg_Dbg( p_demux, "added new video es %4.4s %dx%d",