diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-05 12:43:42 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-05 12:43:42 +0100 |
| commit | dbf0b994f29dfd63771a2ec1792860ccf5bc7e4f (patch) | |
| tree | ee24f88c185ad8f607bc00cf844d7fc70d9633e6 | |
| parent | bc9ebb2ff2841fac97e6d99cb12ea913425e9a2a (diff) | |
| download | gstreamer-plugins-bad-dbf0b994f29dfd63771a2ec1792860ccf5bc7e4f.tar.gz | |
x-raw-bayer -> x-bayer
| -rw-r--r-- | gst/bayer/gstbayer2rgb.c | 8 | ||||
| -rw-r--r-- | gst/bayer/gstrgb2bayer.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/gst/bayer/gstbayer2rgb.c b/gst/bayer/gstbayer2rgb.c index 69d439056..cfb7557a1 100644 --- a/gst/bayer/gstbayer2rgb.c +++ b/gst/bayer/gstbayer2rgb.c @@ -128,7 +128,7 @@ struct _GstBayer2RGBClass #define SRC_CAPS \ GST_VIDEO_CAPS_MAKE ("{ RGBx, xRGB, BGRx, xBGR, RGBA, ARGB, BGRA, ABGR }") -#define SINK_CAPS "video/x-raw-bayer,format=(string){bggr,grbg,gbrg,rggb}," \ +#define SINK_CAPS "video/x-bayer,format=(string){bggr,grbg,gbrg,rggb}," \ "width=(int)[1,MAX],height=(int)[1,MAX],framerate=(fraction)[0/1,MAX]" enum @@ -171,7 +171,7 @@ gst_bayer2rgb_class_init (GstBayer2RGBClass * klass) gst_element_class_set_details_simple (gstelement_class, "Bayer to RGB decoder for cameras", "Filter/Converter/Video", - "Converts video/x-raw-bayer to video/x-raw", + "Converts video/x-bayer to video/x-raw", "William Brack <wbrack@mmm.com.hk>"); gst_element_class_add_pad_template (gstelement_class, @@ -291,7 +291,7 @@ gst_bayer2rgb_transform_caps (GstBaseTransform * base, structure = gst_caps_get_structure (caps, 0); if (direction == GST_PAD_SRC) { - newcaps = gst_caps_from_string ("video/x-raw-bayer," + newcaps = gst_caps_from_string ("video/x-bayer," "format=(string){bggr,grbg,gbrg,rggb}"); } else { newcaps = gst_caps_new_empty_simple ("video/x-raw"); @@ -324,7 +324,7 @@ gst_bayer2rgb_get_unit_size (GstBaseTransform * base, GstCaps * caps, if (gst_structure_get_int (structure, "width", &width) && gst_structure_get_int (structure, "height", &height)) { name = gst_structure_get_name (structure); - /* Our name must be either video/x-raw-bayer video/x-raw-rgb */ + /* Our name must be either video/x-bayer video/x-raw */ if (strcmp (name, "video/x-raw")) { *size = GST_ROUND_UP_4 (width) * height; return TRUE; diff --git a/gst/bayer/gstrgb2bayer.c b/gst/bayer/gstrgb2bayer.c index 4f2fc7b83..4fa3ff18b 100644 --- a/gst/bayer/gstrgb2bayer.c +++ b/gst/bayer/gstrgb2bayer.c @@ -67,7 +67,7 @@ static GstStaticPadTemplate gst_rgb2bayer_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS ("video/x-raw-bayer," + GST_STATIC_CAPS ("video/x-bayer," "format=(string){bggr,gbrg,grbg,rggb}," "width=[1,MAX],height=[1,MAX]," "framerate=(fraction)[0/1,MAX]") ); @@ -95,7 +95,7 @@ gst_rgb2bayer_class_init (GstRGB2BayerClass * klass) gst_element_class_set_details_simple (element_class, "RGB to Bayer converter", "Filter/Converter/Video", - "Converts video/x-raw to video/x-raw-bayer", + "Converts video/x-raw to video/x-bayer", "David Schleef <ds@entropywave.com>"); base_transform_class->transform_caps = @@ -138,7 +138,7 @@ gst_rgb2bayer_transform_caps (GstBaseTransform * trans, if (direction == GST_PAD_SRC) { newcaps = gst_caps_new_empty_simple ("video/x-raw"); } else { - newcaps = gst_caps_new_empty_simple ("video/x-raw-bayer"); + newcaps = gst_caps_new_empty_simple ("video/x-bayer"); } new_structure = gst_caps_get_structure (newcaps, 0); @@ -177,8 +177,8 @@ gst_rgb2bayer_get_unit_size (GstBaseTransform * trans, GstCaps * caps, if (gst_structure_get_int (structure, "width", &width) && gst_structure_get_int (structure, "height", &height)) { name = gst_structure_get_name (structure); - /* Our name must be either video/x-raw-bayer video/x-raw */ - if (g_str_equal (name, "video/x-raw-bayer")) { + /* Our name must be either video/x-bayer video/x-raw */ + if (g_str_equal (name, "video/x-bayer")) { *size = width * height; return TRUE; } else { |