Commit 1733fc4a authored by Michael Benjamin's avatar Michael Benjamin Committed by Guillaume Poirier

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

Originally committed as revision 6259 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 3c0ba870
...@@ -173,7 +173,11 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) ...@@ -173,7 +173,11 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
pict.depth=24; pict.depth=24;
ret = ioctl(video_fd, VIDIOCSPICT, &pict); ret = ioctl(video_fd, VIDIOCSPICT, &pict);
if (ret < 0) 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 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) ...@@ -256,6 +260,10 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
frame_size = width * height * 3; frame_size = width * height * 3;
st->codec->pix_fmt = PIX_FMT_BGR24; /* NOTE: v4l uses BGR24, not RGB24 ! */ st->codec->pix_fmt = PIX_FMT_BGR24; /* NOTE: v4l uses BGR24, not RGB24 ! */
break; break;
case VIDEO_PALETTE_GREY:
frame_size = width * height * 1;
st->codec->pix_fmt = PIX_FMT_GRAY8;
break;
default: default:
goto fail; goto fail;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment