mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-28 11:10:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix handling of RGB caps

Browse source 
Original commit message from CVS:
Fix handling of RGB caps
This commit is contained in:
David Schleef 2003-07-27 05:31:01 +00:00
parent cf9a455912
commit fb01948689
2 changed files with 32 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/videotestsrc/gstvideotestsrc.c
View file

@ -268,6 +268,7 @@ gst_videotestsrc_change_state (GstElement * element)
v->pool = gst_pad_get_bufferpool (v->srcpad);
break;
case GST_STATE_PLAYING_TO_PAUSED:
gst_buffer_pool_unref(v->pool);
v->pool = NULL;
break;
case GST_STATE_READY_TO_NULL:
@ -419,7 +420,7 @@ gst_videotestsrc_get (GstPad * pad)
newsize = (videotestsrc->width * videotestsrc->height * videotestsrc->bpp) >> 3;
g_return_val_if_fail (newsize > 0, NULL);
GST_DEBUG ("size=%ld %dx%d\n", newsize, videotestsrc->width, videotestsrc->height);
GST_DEBUG ("size=%ld %dx%d", newsize, videotestsrc->width, videotestsrc->height);
buf = NULL;
if (videotestsrc->pool) {
@ -431,9 +432,7 @@ gst_videotestsrc_get (GstPad * pad)
}
}
if (!buf) {
buf = gst_buffer_new ();
GST_BUFFER_SIZE (buf) = newsize;
GST_BUFFER_DATA (buf) = g_malloc (newsize);
buf = gst_buffer_new_and_alloc (newsize);
}
g_return_val_if_fail (GST_BUFFER_DATA (buf) != NULL, NULL);

69
gst/videotestsrc/videotestsrc.c
View file

@ -385,11 +385,11 @@ struct fourcc_list_struct *paintinfo_find_by_caps(GstCaps *caps)
{
int i;
const char *mimetype = gst_caps_get_mime(caps);
guint32 format;
if(strcmp(mimetype, "video/x-raw-yuv")==0){
char *s;
int fourcc;
guint32 format;
gst_caps_get(caps, "format", &format);
for (i = 0; i < n_fourccs; i++) {
@ -401,7 +401,28 @@ struct fourcc_list_struct *paintinfo_find_by_caps(GstCaps *caps)
}
}
}else if(strcmp(mimetype, "video/x-raw-rgb")==0){
g_warning("video/x-raw-rgb not implemented");
int red_mask;
int green_mask;
int blue_mask;
int depth;
int bpp;
gst_caps_get(caps, "red_mask", &red_mask,
"green_mask", &green_mask,
"blue_mask", &blue_mask,
"depth", &depth,
"bpp", &bpp);
for (i = 0; i < n_fourccs; i++) {
if (strcmp(fourcc_list[i].fourcc, "RGB ") == 0 &&
fourcc_list[i].red_mask == red_mask &&
fourcc_list[i].green_mask == green_mask &&
fourcc_list[i].blue_mask == blue_mask &&
fourcc_list[i].depth == depth &&
fourcc_list[i].bitspp == bpp){
return fourcc_list + i;
}
}
return NULL;
}else{
g_warning("unknown format");
@ -458,53 +479,21 @@ GstCaps *paint_get_caps(struct fourcc_list_struct *format)
fourcc = GST_MAKE_FOURCC (format->fourcc[0], format->fourcc[1], format->fourcc[2], format->fourcc[3]);
if(format->ext_caps){
#if GST_VERSION_MINOR > 6
caps = GST_CAPS_NEW ("videotestsrc_filter",
"video/x-raw-rgb",
"bpp", GST_PROPS_INT(format->bitspp),
"endianness", GST_PROPS_INT(G_BIG_ENDIAN),
"depth", GST_PROPS_INT(format->depth),
"red_mask", GST_PROPS_INT(format->red_mask),
"green_mask", GST_PROPS_INT(format->green_mask),
"blue_mask", GST_PROPS_INT(format->blue_mask));
#else
guint32 red_mask;
guint32 green_mask;
guint32 blue_mask;
guint32 endianness;
int endianness;
if(format->bitspp==16){
endianness = G_BYTE_ORDER;
red_mask = format->red_mask;
green_mask = format->green_mask;
blue_mask = format->blue_mask;
}else if(format->bitspp==24){
endianness = G_BYTE_ORDER;
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
red_mask = GUINT32_SWAP_LE_BE(format->red_mask)>>8;
green_mask = GUINT32_SWAP_LE_BE(format->green_mask)>>8;
blue_mask = GUINT32_SWAP_LE_BE(format->blue_mask)>>8;
#else
red_mask = format->red_mask;
green_mask = format->green_mask;
blue_mask = format->blue_mask;
#endif
endianness = G_BYTE_ORDER;
}else{
endianness = G_BYTE_ORDER;
red_mask = GUINT32_FROM_BE(format->red_mask);
green_mask = GUINT32_FROM_BE(format->green_mask);
blue_mask = GUINT32_FROM_BE(format->blue_mask);
endianness = G_BIG_ENDIAN;
}
caps = GST_CAPS_NEW ("videotestsrc_filter",
"video/x-raw-rgb",
"bpp", GST_PROPS_INT(format->bitspp),
"endianness", GST_PROPS_INT(endianness),
"depth", GST_PROPS_INT(format->depth),
"red_mask", GST_PROPS_INT(red_mask),
"green_mask", GST_PROPS_INT(green_mask),
"blue_mask", GST_PROPS_INT(blue_mask));
#endif
"red_mask", GST_PROPS_INT(format->red_mask),
"green_mask", GST_PROPS_INT(format->green_mask),
"blue_mask", GST_PROPS_INT(format->blue_mask));
}else{
caps = GST_CAPS_NEW ("videotestsrc_filter",
"video/x-raw-yuv",