mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 16:26:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

use correct caps

Browse source 
Original commit message from CVS:
use correct caps
This commit is contained in:
Benjamin Otte 2003-11-25 23:45:41 +00:00
parent dddf7c2b3e
commit 47e31d379f
2 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ext/gdk_pixbuf/gst_loader.c
View file

@ -220,6 +220,8 @@ fill_info (GdkPixbufFormat *info)
{ "RIFF AVI ", " xxxx ", 100 }, { "RIFF AVI ", " xxxx ", 100 },
/* MPEG 1 */ /* MPEG 1 */
{ "xx\001\272", "zz ", 100 }, { "xx\001\272", "zz ", 100 },
/* MPEG 2 */
{ "xx\001\263", "zz ", 100 },
/* Quicktime */ /* Quicktime */
{ " wide", "xxxx ", 80 }, { " wide", "xxxx ", 80 },
{ " moov", "xxxx ", 80 }, { " moov", "xxxx ", 80 },
@ -227,6 +229,8 @@ fill_info (GdkPixbufFormat *info)
{ " pnot", "xxxx ", 80 }, { " pnot", "xxxx ", 80 },
{ " PICT", "xxxx ", 80 }, { " PICT", "xxxx ", 80 },
{ " free", "xxxx ", 80 }, { " free", "xxxx ", 80 },
/* ASF */
{ "\060\046\262\165\216\146\317\021\246\331 \252 \142\316\154", " z z ", 100 },
{ NULL, NULL, 0 } { NULL, NULL, 0 }
}; };
@ -234,6 +238,7 @@ fill_info (GdkPixbufFormat *info)
"video/avi", "video/x-avi", "video/x-msvideo", "video/avi", "video/x-avi", "video/x-msvideo",
"video/mpeg", "video/mpeg",
"video/quicktime", "video/quicktime",
"video/x-ms-asf",
NULL NULL
}; };
@ -241,6 +246,7 @@ fill_info (GdkPixbufFormat *info)
"avi", "avi",
"mpeg", "mpe", "mpg", "mpeg", "mpe", "mpg",
"mov", "mov",
"asf", "wmv",
NULL NULL
}; };

35
ext/gdk_pixbuf/gstgdkanimation.c
View file

@ -235,17 +235,22 @@ static gboolean
gst_gdk_animation_iter_create_pipeline (GstGdkAnimationIter *iter) gst_gdk_animation_iter_create_pipeline (GstGdkAnimationIter *iter)
{ {
GstElement *src, *typefind, *autoplugger, *sink, *colorspace; GstElement *src, *typefind, *autoplugger, *sink, *colorspace;
GstCaps *caps = GST_CAPS_NEW ("pixbuf_filter", GstCaps *caps = GST_CAPS_NEW ("pixbuf_filter32",
"video/x-raw-rgb", "video/x-raw-rgb",
"endianness", GST_PROPS_INT (G_BIG_ENDIAN), "endianness", GST_PROPS_INT (G_BIG_ENDIAN),
"bpp", GST_PROPS_LIST ( "bpp", GST_PROPS_INT (32),
GST_PROPS_INT (32), "red_mask", GST_PROPS_INT (0xFF000000),
GST_PROPS_INT (24) "green_mask", GST_PROPS_INT (0x00FF0000),
), "blue_mask", GST_PROPS_INT (0x0000FF00)
"red_mask", GST_PROPS_INT (0x00FF0000),
"green_mask", GST_PROPS_INT (0x0000FF00),
"blue_mask", GST_PROPS_INT (0x000000FF)
); );
gst_caps_append (caps, GST_CAPS_NEW ("pixbuf_filter24",
"video/x-raw-rgb",
"endianness", GST_PROPS_INT (G_BIG_ENDIAN),
"bpp", GST_PROPS_INT (24),
"red_mask", GST_PROPS_INT (0xFF0000),
"green_mask", GST_PROPS_INT (0x00FF00),
"blue_mask", GST_PROPS_INT (0x0000FF)
));
iter->pipeline = gst_element_factory_make ("pipeline", "main_pipeline"); iter->pipeline = gst_element_factory_make ("pipeline", "main_pipeline");
if (iter->pipeline == NULL) return FALSE; if (iter->pipeline == NULL) return FALSE;
@ -276,15 +281,11 @@ gst_gdk_animation_iter_create_pipeline (GstGdkAnimationIter *iter)
if (!gst_element_link (typefind, autoplugger)) if (!gst_element_link (typefind, autoplugger))
goto error; goto error;
/* add ffcolorspace if available so we get svq1, too */ /* try ffcolorspace if available so we get svq1, too */
if ((colorspace = gst_element_factory_make ("ffcolorspace", "ffcolorspace"))) { colorspace = gst_element_factory_make ("ffcolorspace", "ffcolorspace");
gst_bin_add (GST_BIN (iter->pipeline), colorspace); if (!colorspace)
if (!gst_element_link (autoplugger, colorspace)) colorspace = gst_element_factory_make ("colorspace", "colorspace");
goto error; if (!colorspace)
autoplugger = colorspace;
}
if (!(colorspace = gst_element_factory_make ("colorspace", "colorspace")))
goto error; goto error;
gst_bin_add (GST_BIN (iter->pipeline), colorspace); gst_bin_add (GST_BIN (iter->pipeline), colorspace);
if (!gst_element_link (autoplugger, colorspace)) if (!gst_element_link (autoplugger, colorspace))