Move log spam from caps enum due to frame sizes into higher level

When the stepwise framesize has a low step value, we'll get quite
a bit of logs. Make some effort to limit them.

Update changelog for branch contents.

Change-Id: If6441307baf24927e0e4fb76c26a4a02d2bb50dc

diff --git a/gst-libs/gst/camera/gstmfldcamerasrc.c b/gst-libs/gst/camera/gstmfldcamerasrc.c
index 6f3a57c..e72018c 100644 (file)
--- a/gst-libs/gst/camera/gstmfldcamerasrc.c
+++ b/gst-libs/gst/camera/gstmfldcamerasrc.c
@@ -680,7 +680,8 @@ gst_camerasrc_negotiate (GstBaseSrc * basesrc)
 
   /* first see what is possible on our source pad */
   thiscaps = gst_pad_get_caps (GST_BASE_SRC_PAD (basesrc));
-  GST_DEBUG_OBJECT (basesrc, "caps of src: %" GST_PTR_FORMAT, thiscaps);
+  GST_DEBUG_OBJECT (basesrc, "caps of src suppressed on DEBUG (>= 5 to see)");
+  GST_LOG_OBJECT (basesrc, "caps of src: %" GST_PTR_FORMAT, thiscaps);
   /* nothing or anything is allowed, we're done */
   if (thiscaps == NULL || gst_caps_is_any (thiscaps))
     goto no_nego_needed;

diff --git a/gst/mfldv4l2cam/gstv4l2camsrc.c b/gst/mfldv4l2cam/gstv4l2camsrc.c
index 1ce554b..381a0be 100644 (file)
--- a/gst/mfldv4l2cam/gstv4l2camsrc.c
+++ b/gst/mfldv4l2cam/gstv4l2camsrc.c
@@ -589,7 +589,8 @@ gst_v4l2camsrc_get_caps (GstCameraSrc * camsrc)
 
   v4l2camsrc->probed_caps = gst_caps_ref (ret);
 
-  GST_INFO_OBJECT (v4l2camsrc, "probed caps: %" GST_PTR_FORMAT, ret);
+  GST_INFO_OBJECT(v4l2camsrc, "use GST_DEBUG >= 5 for probed caps");
+  GST_LOG_OBJECT (v4l2camsrc, "probed caps: %" GST_PTR_FORMAT, ret);
 
   return ret;
 }

diff --git a/gst/mfldv4l2cam/v4l2camsrc_calls.c b/gst/mfldv4l2cam/v4l2camsrc_calls.c
index 448a1fa..5f64bb6 100644 (file)
--- a/gst/mfldv4l2cam/v4l2camsrc_calls.c
+++ b/gst/mfldv4l2cam/v4l2camsrc_calls.c
@@ -1798,7 +1798,7 @@ gst_v4l2camsrc_probe_caps_for_format (GstMFLDV4l2CamSrc * v4l2camsrc,
     size.index = 0;
     size.pixel_format = pixelformat;
 
-    GST_DEBUG_OBJECT (v4l2camsrc, "Enumerating frame sizes");
+    GST_LOG_OBJECT (v4l2camsrc, "Enumerating frame sizes");
 
     if (ioctl (fd, VIDIOC_ENUM_FRAMESIZES, &size) < 0)
       goto enum_framesizes_failed;
@@ -1820,21 +1820,21 @@ gst_v4l2camsrc_probe_caps_for_format (GstMFLDV4l2CamSrc * v4l2camsrc,
        }
         size.index++;
       } while (ioctl (fd, VIDIOC_ENUM_FRAMESIZES, &size) >= 0);
-      GST_DEBUG_OBJECT (v4l2camsrc,
+      GST_LOG_OBJECT (v4l2camsrc,
           "done iterating discrete frame sizes");
   } else if (size.type == V4L2_FRMSIZE_TYPE_STEPWISE) {
-    GST_DEBUG_OBJECT (v4l2camsrc, "we have stepwise frame sizes:");
-    GST_DEBUG_OBJECT (v4l2camsrc, "min width:   %d",
+    GST_LOG_OBJECT (v4l2camsrc, "we have stepwise frame sizes:");
+    GST_LOG_OBJECT (v4l2camsrc, "min width:   %d",
         size.stepwise.min_width);
-    GST_DEBUG_OBJECT (v4l2camsrc, "min height:  %d",
+    GST_LOG_OBJECT (v4l2camsrc, "min height:  %d",
         size.stepwise.min_height);
-    GST_DEBUG_OBJECT (v4l2camsrc, "max width:   %d",
+    GST_LOG_OBJECT (v4l2camsrc, "max width:   %d",
         size.stepwise.max_width);
-    GST_DEBUG_OBJECT (v4l2camsrc, "min height:  %d",
+    GST_LOG_OBJECT (v4l2camsrc, "min height:  %d",
         size.stepwise.max_height);
-    GST_DEBUG_OBJECT (v4l2camsrc, "step width:  %d",
+    GST_LOG_OBJECT (v4l2camsrc, "step width:  %d",
         size.stepwise.step_width);
-    GST_DEBUG_OBJECT (v4l2camsrc, "step height: %d",
+    GST_LOG_OBJECT (v4l2camsrc, "step height: %d",
         size.stepwise.step_height);
 
     for (w = size.stepwise.min_width, h = size.stepwise.min_height;
@@ -1850,16 +1850,16 @@ gst_v4l2camsrc_probe_caps_for_format (GstMFLDV4l2CamSrc * v4l2camsrc,
       if (tmp)
         results = g_list_prepend (results, tmp);
     }
-    GST_DEBUG_OBJECT (v4l2camsrc,
+    GST_LOG_OBJECT (v4l2camsrc,
         "done iterating stepwise frame sizes");
     } else if (size.type == V4L2_FRMSIZE_TYPE_CONTINUOUS) {
       guint32 maxw, maxh;
 
-      GST_DEBUG_OBJECT (v4l2camsrc, "we have continuous frame sizes:");
-      GST_DEBUG_OBJECT (v4l2camsrc, "min width:   %d", size.stepwise.min_width);
-      GST_DEBUG_OBJECT (v4l2camsrc, "min height:  %d", size.stepwise.min_height);
-      GST_DEBUG_OBJECT (v4l2camsrc, "max width:   %d", size.stepwise.max_width);
-      GST_DEBUG_OBJECT (v4l2camsrc, "min height:  %d", size.stepwise.max_height);
+      GST_LOG_OBJECT (v4l2camsrc, "we have continuous frame sizes:");
+      GST_LOG_OBJECT (v4l2camsrc, "min width:   %d", size.stepwise.min_width);
+      GST_LOG_OBJECT (v4l2camsrc, "min height:  %d", size.stepwise.min_height);
+      GST_LOG_OBJECT (v4l2camsrc, "max width:   %d", size.stepwise.max_width);
+      GST_LOG_OBJECT (v4l2camsrc, "min height:  %d", size.stepwise.max_height);
 
       w = MAX (size.stepwise.min_width, 1);
       h = MAX (size.stepwise.min_height, 1);
@@ -1893,7 +1893,7 @@ gst_v4l2camsrc_probe_caps_for_format (GstMFLDV4l2CamSrc * v4l2camsrc,
       min_w = max_w / RESIZER_MAX_DOWNSCALE_FACTOR;
       min_h = max_h / RESIZER_MAX_DOWNSCALE_FACTOR;
 
-      GST_DEBUG_OBJECT (v4l2camsrc,
+      GST_LOG_OBJECT (v4l2camsrc,
           "Setting up range %dx%d - %dx%d", min_w, min_h, max_w, max_h);
 
       gst_structure_set (tmp,

diff --git a/packaging/mfldv4l2camsrc.changes b/packaging/mfldv4l2camsrc.changes
index 5da24d7..feea51a 100644 (file)
--- a/packaging/mfldv4l2camsrc.changes
+++ b/packaging/mfldv4l2camsrc.changes
@@ -1,3 +1,8 @@
+* Tue Aug 14 2012 Jussi Saavalainen <jussi.saavalainen@ixonos.com> v0.43@7d6159f
+- Move log spam from caps enum due to frame sizes into higher level
+- Manually merge upstream non-discrete framesize enumeration
+- Log unknowns when ranking pixel formats
+
 * Tue Aug 14 2012 Marko Ollonen <marko.ollonen@ixonos.com> v0.43@1e08b82
 - basic AF support to camera control interface
 - update changelog