mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

ifdef out ARGB type when it isn't available in xvidcore 1.0.0beta2

Browse source 
Original commit message from CVS:
ifdef out ARGB type when it isn't available in xvidcore 1.0.0beta2
This commit is contained in:
Jan Schmidt 2004-01-06 14:34:52 +00:00
parent c0c379cccb
commit 0051f0e18e
4 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2004-01-07 Jan Schmidt <thaytan@mad.scientist.com>
* ext/xvid/gstxvid.c: (gst_xvid_structure_to_csp),
(gst_xvid_csp_to_caps):
* ext/xvid/gstxviddec.c: (gst_xviddec_src_getcaps):
* ext/xvid/gstxvidenc.c:
ifdef out ARGB type when it isn't available
in xvidcore 1.0.0beta2
2004-01-06 Ronald Bultje <rbultje@ronald.bitfreak.net> 2004-01-06 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst/mpegstream/gstmpegparse.c: (gst_mpeg_parse_loop): * gst/mpegstream/gstmpegparse.c: (gst_mpeg_parse_loop):

6
ext/xvid/gstxvid.c
View file

@ -147,9 +147,11 @@ gst_xvid_structure_to_csp (GstStructure *structure,
case 0xff000000: case 0xff000000:
xvid_cs = XVID_CSP_RGBA; xvid_cs = XVID_CSP_RGBA;
break; break;
#ifdef XVID_CSP_ARGB
case 0x00ff0000: case 0x00ff0000:
xvid_cs = XVID_CSP_ARGB; xvid_cs = XVID_CSP_ARGB;
break; break;
#endif
case 0x0000ff00: case 0x0000ff00:
xvid_cs = XVID_CSP_BGRA; xvid_cs = XVID_CSP_BGRA;
break; break;
@ -185,7 +187,9 @@ gst_xvid_csp_to_caps (gint csp, gint w, gint h, gdouble fps)
case XVID_CSP_BGR: case XVID_CSP_BGR:
case XVID_CSP_ABGR: case XVID_CSP_ABGR:
case XVID_CSP_BGRA: case XVID_CSP_BGRA:
#ifdef XVID_CSP_ARGB
case XVID_CSP_ARGB: case XVID_CSP_ARGB:
#endif
case XVID_CSP_RGBA: { case XVID_CSP_RGBA: {
gint r_mask = 0, b_mask = 0, g_mask = 0, gint r_mask = 0, b_mask = 0, g_mask = 0,
endianness = 0, bpp = 0, depth = 0; endianness = 0, bpp = 0, depth = 0;
@ -211,10 +215,12 @@ gst_xvid_csp_to_caps (gint csp, gint w, gint h, gdouble fps)
r_mask = 0x0000ff00; g_mask = 0x00ff0000; b_mask = 0xff000000; r_mask = 0x0000ff00; g_mask = 0x00ff0000; b_mask = 0xff000000;
endianness = G_BIG_ENDIAN; depth = 24; bpp = 32; endianness = G_BIG_ENDIAN; depth = 24; bpp = 32;
break; break;
#ifdef XVID_CSP_ARGB
case XVID_CSP_ARGB: case XVID_CSP_ARGB:
r_mask = 0x00ff0000; g_mask = 0x0000ff00; b_mask = 0x000000ff; r_mask = 0x00ff0000; g_mask = 0x0000ff00; b_mask = 0x000000ff;
endianness = G_BIG_ENDIAN; depth = 24; bpp = 32; endianness = G_BIG_ENDIAN; depth = 24; bpp = 32;
break; break;
#endif
case XVID_CSP_RGBA: case XVID_CSP_RGBA:
r_mask = 0xff000000; g_mask = 0x00ff0000; b_mask = 0x0000ff00; r_mask = 0xff000000; g_mask = 0x00ff0000; b_mask = 0x0000ff00;
endianness = G_BIG_ENDIAN; depth = 24; bpp = 32; endianness = G_BIG_ENDIAN; depth = 24; bpp = 32;

4
ext/xvid/gstxviddec.c
View file

@ -55,7 +55,9 @@ GST_STATIC_PAD_TEMPLATE (
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ( GST_STATIC_CAPS (
GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("{ I420, YUY2, YV12, YVYU, UYVY }") "; " GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("{ I420, YUY2, YV12, YVYU, UYVY }") "; "
#ifdef XVID_CSP_ARGB
RGB_24_32_STATIC_CAPS (32, 0x00ff0000, 0x0000ff00, 0x000000ff) "; " RGB_24_32_STATIC_CAPS (32, 0x00ff0000, 0x0000ff00, 0x000000ff) "; "
#endif
RGB_24_32_STATIC_CAPS (32, 0xff000000, 0x00ff0000, 0x0000ff00) "; " RGB_24_32_STATIC_CAPS (32, 0xff000000, 0x00ff0000, 0x0000ff00) "; "
RGB_24_32_STATIC_CAPS (32, 0x0000ff00, 0x00ff0000, 0xff000000) "; " RGB_24_32_STATIC_CAPS (32, 0x0000ff00, 0x00ff0000, 0xff000000) "; "
RGB_24_32_STATIC_CAPS (32, 0x000000ff, 0x0000ff00, 0x00ff0000) "; " RGB_24_32_STATIC_CAPS (32, 0x000000ff, 0x0000ff00, 0x00ff0000) "; "
@ -288,7 +290,9 @@ gst_xviddec_src_getcaps (GstPad *pad)
XVID_CSP_BGRA, XVID_CSP_BGRA,
XVID_CSP_ABGR, XVID_CSP_ABGR,
XVID_CSP_RGBA, XVID_CSP_RGBA,
#ifdef XVID_CSP_ARGB
XVID_CSP_ARGB, XVID_CSP_ARGB,
#endif
XVID_CSP_BGR, XVID_CSP_BGR,
XVID_CSP_RGB555, XVID_CSP_RGB555,
XVID_CSP_RGB565, XVID_CSP_RGB565,

2
ext/xvid/gstxvidenc.c
View file

@ -43,7 +43,9 @@ GST_STATIC_PAD_TEMPLATE (
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ( GST_STATIC_CAPS (
GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("{ I420, YUY2, YV12, YVYU, UYVY }") "; " GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("{ I420, YUY2, YV12, YVYU, UYVY }") "; "
#ifdef XVID_CSP_ARGB
RGB_24_32_STATIC_CAPS (32, 0x00ff0000, 0x0000ff00, 0x000000ff) "; " RGB_24_32_STATIC_CAPS (32, 0x00ff0000, 0x0000ff00, 0x000000ff) "; "
#endif
RGB_24_32_STATIC_CAPS (32, 0xff000000, 0x00ff0000, 0x0000ff00) "; " RGB_24_32_STATIC_CAPS (32, 0xff000000, 0x00ff0000, 0x0000ff00) "; "
RGB_24_32_STATIC_CAPS (32, 0x0000ff00, 0x00ff0000, 0xff000000) "; " RGB_24_32_STATIC_CAPS (32, 0x0000ff00, 0x00ff0000, 0xff000000) "; "
RGB_24_32_STATIC_CAPS (32, 0x000000ff, 0x0000ff00, 0x00ff0000) "; " RGB_24_32_STATIC_CAPS (32, 0x000000ff, 0x0000ff00, 0x00ff0000) "; "