Fix endianness problems in caps. Fixes #124006

Original commit message from CVS:
Fix endianness problems in caps.  Fixes #124006

diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c
index bbf49bbdbe29cd924b51b1204c27ac0ed7c403b2..f571fc3ffa0c7b800b8fb77923307e915cb61aad 100644 (file)
--- a/gst/goom/gstgoom.c
+++ b/gst/goom/gstgoom.c
@@ -244,14 +244,14 @@ gst_goom_negotiate_default (GstGOOM *goom)
 
   caps = GST_CAPS_NEW (
             "goomsrc",
-            "video/raw",
+            "video/x-raw-rgb",
               "format",        GST_PROPS_FOURCC (GST_STR_FOURCC ("RGB ")), 
               "bpp",           GST_PROPS_INT (32), 
               "depth",         GST_PROPS_INT (32), 
-              "endianness",    GST_PROPS_INT (G_BYTE_ORDER), 
-              "red_mask",      GST_PROPS_INT (0xff0000), 
-              "green_mask",    GST_PROPS_INT (0x00ff00), 
-              "blue_mask",     GST_PROPS_INT (0x0000ff), 
+              "endianness",    GST_PROPS_INT (G_BIG_ENDIAN),
+              "red_mask",      GST_PROPS_INT (R_MASK_32), 
+              "green_mask",    GST_PROPS_INT (G_MASK_32), 
+              "blue_mask",     GST_PROPS_INT (B_MASK_32), 
               "width",         GST_PROPS_INT (goom->width), 
               "height",        GST_PROPS_INT (goom->height),
               "framerate",     GST_PROPS_FLOAT (goom->fps)

diff --git a/gst/monoscope/gstmonoscope.c b/gst/monoscope/gstmonoscope.c
index 9eb8bb4327547c9252745e1f96b654a431dc6a2b..13a6099b45b3815370328a059fc1d359d2c527a1 100644 (file)
--- a/gst/monoscope/gstmonoscope.c
+++ b/gst/monoscope/gstmonoscope.c
@@ -93,7 +93,7 @@ GST_PAD_TEMPLATE_FACTORY (src_template,
     "video/x-raw-rgb",
       "bpp",           GST_PROPS_INT (32),
       "depth",         GST_PROPS_INT (32),
-      "endianness",    GST_PROPS_INT (G_BYTE_ORDER),
+      "endianness",    GST_PROPS_INT (G_BIG_ENDIAN),
       "red_mask",      GST_PROPS_INT (R_MASK_32),
       "green_mask",    GST_PROPS_INT (G_MASK_32),
       "blue_mask",     GST_PROPS_INT (B_MASK_32),
@@ -215,13 +215,13 @@ gst_monoscope_negotiate (GstMonoscope *monoscope)
                     "video/x-raw-rgb",
                       "bpp",           GST_PROPS_INT (32), 
                       "depth",         GST_PROPS_INT (32), 
-                      "endianness",    GST_PROPS_INT (G_BYTE_ORDER), 
+                      "endianness",    GST_PROPS_INT (G_BIG_ENDIAN), 
                       "red_mask",      GST_PROPS_INT (R_MASK_32), 
                       "green_mask",    GST_PROPS_INT (G_MASK_32), 
                       "blue_mask",     GST_PROPS_INT (B_MASK_32), 
                       "width",         GST_PROPS_INT (monoscope->width), 
                       "height",        GST_PROPS_INT (monoscope->height),
-                       "framerate",     GST_PROPS_FLOAT (monoscope->fps)
+               "framerate",     GST_PROPS_FLOAT (monoscope->fps)
                   );
 
   return gst_pad_try_set_caps (monoscope->srcpad, caps);