sys/v4l/: Change g_warnings to GST_WARNING_OBJECT and fix colourspace issue

Original commit message from CVS:
2004-10-10  Zaheer Abbas Merali  <zaheerabbas at merali dot org>

* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_palette_to_caps),
(gst_v4lsrc_getcaps), (gst_v4lsrc_get):
* sys/v4l/v4l-overlay_calls.c: (gst_v4l_set_overlay):
Change g_warnings to GST_WARNING_OBJECT and fix colourspace issue

diff --git a/ChangeLog b/ChangeLog
index ad676e46e6c418e07ed3df0ed04d21254417bcc7..9e96bee8f1500f46b1e38dc08be93ee37e371a98 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-10  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
+
+       * sys/v4l/gstv4lsrc.c: (gst_v4lsrc_palette_to_caps),
+       (gst_v4lsrc_getcaps), (gst_v4lsrc_get):
+       * sys/v4l/v4l-overlay_calls.c: (gst_v4l_set_overlay):
+       Change g_warnings to GST_WARNING_OBJECT and fix colourspace issue
+
 2004-10-10  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 
        * sys/v4l/gstv4lsrc.c: (gst_v4lsrc_src_link), (gst_v4lsrc_getcaps):

diff --git a/sys/v4l/gstv4lsrc.c b/sys/v4l/gstv4lsrc.c
index 51d787a1d64d43709e13adcf9baacb43e894dda8..6925b8b3c4843acf69da8901b95609343a7f7118 100644 (file)
--- a/sys/v4l/gstv4lsrc.c
+++ b/sys/v4l/gstv4lsrc.c
@@ -567,8 +567,8 @@ gst_v4lsrc_palette_to_caps (int palette)
             "bpp = (int) 24, "
             "depth = (int) 24, "
             "endianness = (int) BIG_ENDIAN, "
-            "red_mask = 0xFF0000, "
-            "green_mask = 0x00FF00, " "blue_mask = 0x0000FF");
+            "red_mask = 0x0000FF, "
+            "green_mask = 0x00FF00, " "blue_mask = 0xFF0000");
         break;
       case VIDEO_PALETTE_RGB32:
         caps = gst_caps_from_string ("video/x-raw-rgb, "
@@ -817,7 +817,8 @@ gst_v4lsrc_getcaps (GstPad * pad)
 
     one = gst_v4lsrc_palette_to_caps (GPOINTER_TO_INT (item->data));
     if (!one)
-      g_print ("Palette %d gave no caps\n", GPOINTER_TO_INT (item->data));
+      GST_WARNING_OBJECT (v4lsrc, "Palette %d gave no caps\n",
+          GPOINTER_TO_INT (item->data));
     GST_DEBUG_OBJECT (v4lsrc,
         "Device reports w: %d-%d, h: %d-%d, fps: %f for palette %d",
         vcap->minwidth, vcap->maxwidth, vcap->minheight, vcap->maxheight, fps,
@@ -1013,7 +1014,7 @@ gst_v4lsrc_get (GstPad * pad)
     GST_LOG_OBJECT (v4lsrc, "waiting until %" GST_TIME_FORMAT,
         GST_TIME_ARGS (until));
     if (!gst_element_wait (GST_ELEMENT (v4lsrc), until))
-      g_warning ("waiting from now %" GST_TIME_FORMAT
+      GST_WARNING_OBJECT (v4lsrc, "waiting from now %" GST_TIME_FORMAT
           " until %" GST_TIME_FORMAT " failed",
           GST_TIME_ARGS (now), GST_TIME_ARGS (until));
     GST_LOG_OBJECT (v4lsrc, "wait done.");

diff --git a/sys/v4l/v4l-overlay_calls.c b/sys/v4l/v4l-overlay_calls.c
index 25f5f71102a52cc9e9046a9c684ffc546ef92795..675d3089ae09b2d2024be6d7b46d1148899fa1c4 100644 (file)
--- a/sys/v4l/v4l-overlay_calls.c
+++ b/sys/v4l/v4l-overlay_calls.c
@@ -90,7 +90,7 @@ gst_v4l_set_overlay (GstV4lElement * v4lelement)
        * always fatal (like not having overlay support) */
       gint status = WEXITSTATUS (ret);
 
-      g_warning ("v4l-conf returned %d.", status);
+      GST_WARNING_OBJECT (v4lelement, "v4l-conf returned %d.", status);
       g_free (buff);
       return TRUE;
     }