From: <wt...@ke...> - 2008-10-31 09:50:18
|
CVS Root: /cvs/gstreamer Module: gst-plugins-base Changes by: wtay Date: Fri Oct 31 2008 09:50:11 UTC Log message: Patch by: Nick Haddad <nick at haddads dot net> * gst-libs/gst/riff/riff-ids.h: * gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps): Add support for other fourcc codes that are commonly used for 'uncompressed RGB', including 'RGB ', 'RAW ', and 0. Fixes #558553. Modified files: . : ChangeLog gst-libs/gst/riff: riff-ids.h riff-media.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.4177&r2=1.4178 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/riff/riff-ids.h.diff?r1=1.24&r2=1.25 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/riff/riff-media.c.diff?r1=1.107&r2=1.108 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v retrieving revision 1.4177 retrieving revision 1.4178 diff -u -d -r1.4177 -r1.4178 --- ChangeLog 30 Oct 2008 11:43:11 -0000 1.4177 +++ ChangeLog 31 Oct 2008 09:49:54 -0000 1.4178 @@ -1,3 +1,13 @@ +2008-10-31 Wim Taymans <wim...@co...> + + Patch by: Nick Haddad <nick at haddads dot net> + * gst-libs/gst/riff/riff-ids.h: + * gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps): + Add support for other fourcc codes that are commonly used for + 'uncompressed RGB', including 'RGB ', 'RAW ', and 0. + Fixes #558553. 2008-10-30 Stefan Kost <en...@us...> * gst/audioresample/gstaudioresample.c: Index: riff-ids.h RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/riff/riff-ids.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- riff-ids.h 30 Jul 2008 09:02:31 -0000 1.24 +++ riff-ids.h 31 Oct 2008 09:49:57 -0000 1.25 @@ -135,6 +135,8 @@ #define GST_RIFF_WHAM GST_MAKE_FOURCC ('W', 'H', 'A', 'M') #define GST_RIFF_rgb GST_MAKE_FOURCC (0x00,0x00,0x00,0x00) #define GST_RIFF_RGB GST_MAKE_FOURCC ('R', 'G', 'B', ' ') +#define GST_RIFF_RAW GST_MAKE_FOURCC ('R', 'A', 'W', ' ') +#define GST_RIFF_DIB GST_MAKE_FOURCC ('D', 'I', 'B', ' ') #define GST_RIFF_rle8 GST_MAKE_FOURCC (0x01,0x00,0x00,0x00) #define GST_RIFF_RLE8 GST_MAKE_FOURCC ('R', 'L', 'E', '8') #define GST_RIFF_rle4 GST_MAKE_FOURCC (0x02,0x00,0x00,0x00) Index: riff-media.c RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/riff/riff-media.c,v retrieving revision 1.107 retrieving revision 1.108 diff -u -d -r1.107 -r1.108 --- riff-media.c 15 Oct 2008 15:28:41 -0000 1.107 +++ riff-media.c 31 Oct 2008 09:49:57 -0000 1.108 @@ -59,7 +59,11 @@ GST_DEBUG ("video fourcc %" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (codec_fcc)); switch (codec_fcc) { - case GST_MAKE_FOURCC ('D', 'I', 'B', ' '):{ + case GST_MAKE_FOURCC ('D', 'I', 'B', ' '): /* uncompressed RGB */ + case GST_MAKE_FOURCC (0x00, 0x00, 0x00, 0x00): + case GST_MAKE_FOURCC ('R', 'G', 'B', ' '): + case GST_MAKE_FOURCC ('R', 'A', 'W', ' '): + { gint bpp = (strf && strf->bit_cnt != 0) ? strf->bit_cnt : 8; if (strf) { |