camerabin2: Adding debug categories

Adding debug categories to v4l2camerasrc and camerabin2, also
removing generic category from camerabingeneral.

diff --git a/gst/camerabin2/camerabingeneral.c b/gst/camerabin2/camerabingeneral.c
index 2a50d9e126a96f3f9d9269a2c6e6967f440de07f..0219a0fe3bb4444b196288db52b1efca4e7cc5fb 100644 (file)
--- a/gst/camerabin2/camerabingeneral.c
+++ b/gst/camerabin2/camerabingeneral.c
@@ -31,8 +31,6 @@
 #include "camerabingeneral.h"
 #include <glib.h>
 
-GST_DEBUG_CATEGORY (gst_camerabin_debug);
-
 /**
  * gst_camerabin_add_element:
  * @bin: add an element to this bin

diff --git a/gst/camerabin2/camerabingeneral.h b/gst/camerabin2/camerabingeneral.h
index 93520c5a60dc19ddd6f888e74cdee1c524337ba9..7f453aca2f0b278b12f21576447ebd5be3498a78 100644 (file)
--- a/gst/camerabin2/camerabingeneral.h
+++ b/gst/camerabin2/camerabingeneral.h
@@ -35,8 +35,4 @@ void gst_camerabin_remove_elements_from_bin (GstBin * bin);
 
 gboolean gst_camerabin_drop_eos_probe (GstPad * pad, GstEvent * event, gpointer u_data);
 
-/* debug logging category */
-GST_DEBUG_CATEGORY_EXTERN (gst_camerabin_debug);
-#define GST_CAT_DEFAULT gst_camerabin_debug
-
 #endif /* #ifndef __CAMERABIN_GENERAL_H_ */

diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
index acbe6797334ee67969260162eece3812515b5d7c..9ea7bfb1d496bc6b1cfebeaef2c76927cc2411e3 100644 (file)
--- a/gst/camerabin2/gstcamerabin2.c
+++ b/gst/camerabin2/gstcamerabin2.c
@@ -28,8 +28,10 @@
 
 #include "gstcamerabin2.h"
 
-/* prototypes */
+GST_DEBUG_CATEGORY_STATIC (gst_camera_bin_debug);
+#define GST_CAT_DEFAULT gst_camera_bin_debug
 
+/* prototypes */
 
 enum
 {
@@ -138,8 +140,10 @@ gst_camera_bin_change_state (GstElement * element, GstStateChange trans);
 static void
 gst_camera_bin_start_capture (GstCameraBin * camerabin)
 {
+  GST_DEBUG_OBJECT (camerabin, "Received start-capture");
   g_mutex_lock (camerabin->capture_mutex);
   if (!camerabin->capturing) {
+    GST_INFO_OBJECT (camerabin, "Starting capture, mode: %d", camerabin->mode);
     g_object_set (camerabin->src, "mode", camerabin->mode, NULL);
     camerabin->capturing = TRUE;
   } else {
@@ -381,6 +385,8 @@ gst_camerabin_get_property (GObject * object, guint prop_id,
 gboolean
 gst_camera_bin_plugin_init (GstPlugin * plugin)
 {
+  GST_DEBUG_CATEGORY_INIT (gst_camera_bin_debug, "camerabin2", 0, "CameraBin2");
+
   return gst_element_register (plugin, "camerabin2", GST_RANK_NONE,
       gst_camera_bin_get_type ());
 }

diff --git a/gst/camerabin2/gstv4l2camerasrc.c b/gst/camerabin2/gstv4l2camerasrc.c
index 8d3f7eb82284595c6fe94cfbdf22019ba29111f9..8d4995dcb88caef6c51af4718e41381afd302269 100644 (file)
--- a/gst/camerabin2/gstv4l2camerasrc.c
+++ b/gst/camerabin2/gstv4l2camerasrc.c
@@ -41,8 +41,8 @@
 /* Using "bilinear" as default zoom method */
 #define CAMERABIN_DEFAULT_ZOOM_METHOD 1
 
-//GST_DEBUG_CATEGORY (v4l2_camera_src_debug);
-//#define GST_CAT_DEFAULT v4l2_camera_src_debug
+GST_DEBUG_CATEGORY (v4l2_camera_src_debug);
+#define GST_CAT_DEFAULT v4l2_camera_src_debug
 
 GST_BOILERPLATE (GstV4l2CameraSrc, gst_v4l2_camera_src, GstBaseCameraSrc,
     GST_TYPE_BASE_CAMERA_SRC);
@@ -999,8 +999,8 @@ gst_v4l2_camera_src_base_init (gpointer g_class)
 {
   GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class);
 
-//  GST_DEBUG_CATEGORY_INIT (v4l2_camera_src_debug, "v4l2_camera_src", 0,
-//      "V4l2 camera src");
+  GST_DEBUG_CATEGORY_INIT (v4l2_camera_src_debug, "v4l2camerasrc", 0,
+      "V4l2 camera src");
 
   gst_element_class_set_details_simple (gstelement_class,
       "V4l2 camera src element for camerabin", "Source/Video",