[Ffmpeg-cvslog] r6259 - trunk/libavformat/grab.c

[gpoirier]

Author: gpoirier
Date: Fri Sep 15 13:17:41 2006
New Revision: 6259

Modified:
   trunk/libavformat/grab.c

Log:
Add support for 8-bit grayscale to V4L grabber
patch by Michael Benjamin % neuroptik AH gmail.com %
Original thread:
Date: Aug 24, 2006 5:40 PM
Subject: [Ffmpeg-devel] V4L grab.c patch for Grayscale


Modified: trunk/libavformat/grab.c
==============================================================================
--- trunk/libavformat/grab.c	(original)
+++ trunk/libavformat/grab.c	Fri Sep 15 13:17:41 2006
@@ -173,7 +173,11 @@
                 pict.depth=24;
                 ret = ioctl(video_fd, VIDIOCSPICT, &pict);
                 if (ret < 0)
-                    goto fail1;
+                    pict.palette=VIDEO_PALETTE_GREY;
+                    pict.depth=8;
+                    ret = ioctl(video_fd, VIDIOCSPICT, &pict);
+                    if (ret < 0)
+                        goto fail1;
             }
         }
     }
@@ -256,6 +260,10 @@
         frame_size = width * height * 3;
         st->codec->pix_fmt = PIX_FMT_BGR24; /* NOTE: v4l uses BGR24, not RGB24 ! */
         break;
+    case VIDEO_PALETTE_GREY:
+        frame_size = width * height * 1;
+        st->codec->pix_fmt = PIX_FMT_GRAY8;
+        break;
     default:
         goto fail;
     }