combdetect,ivtc: code cleanup

diff --git a/gst/ivtc/gstcombdetect.c b/gst/ivtc/gstcombdetect.c
index 5e637b7..df7de70 100644 (file)
--- a/gst/ivtc/gstcombdetect.c
+++ b/gst/ivtc/gstcombdetect.c
@@ -139,17 +139,15 @@ gst_comb_detect_class_init (GstCombDetectClass * klass)
 static void
 gst_comb_detect_init (GstCombDetect * combdetect)
 {
-  combdetect->sinkpad =
-      gst_pad_new_from_static_template (&gst_comb_detect_sink_template, "sink");
-  combdetect->srcpad =
-      gst_pad_new_from_static_template (&gst_comb_detect_src_template, "src");
 }
 
 void
 gst_comb_detect_set_property (GObject * object, guint property_id,
     const GValue * value, GParamSpec * pspec)
 {
-  /* GstCombDetect *combdetect = GST_COMB_DETECT (object); */
+  GstCombDetect *combdetect = GST_COMB_DETECT (object);
+
+  GST_DEBUG_OBJECT (combdetect, "set_property");
 
   switch (property_id) {
     default:
@@ -162,7 +160,9 @@ void
 gst_comb_detect_get_property (GObject * object, guint property_id,
     GValue * value, GParamSpec * pspec)
 {
-  /* GstCombDetect *combdetect = GST_COMB_DETECT (object); */
+  GstCombDetect *combdetect = GST_COMB_DETECT (object);
+
+  GST_DEBUG_OBJECT (combdetect, "get_property");
 
   switch (property_id) {
     default:
@@ -174,7 +174,9 @@ gst_comb_detect_get_property (GObject * object, guint property_id,
 void
 gst_comb_detect_dispose (GObject * object)
 {
-  /* GstCombDetect *combdetect = GST_COMB_DETECT (object); */
+  GstCombDetect *combdetect = GST_COMB_DETECT (object);
+
+  GST_DEBUG_OBJECT (combdetect, "dispose");
 
   /* clean up as possible.  may be called multiple times */
 
@@ -184,7 +186,9 @@ gst_comb_detect_dispose (GObject * object)
 void
 gst_comb_detect_finalize (GObject * object)
 {
-  /* GstCombDetect *combdetect = GST_COMB_DETECT (object); */
+  GstCombDetect *combdetect = GST_COMB_DETECT (object);
+
+  GST_DEBUG_OBJECT (combdetect, "finalize");
 
   /* clean up object here */
 
@@ -242,7 +246,9 @@ gst_comb_detect_transform_caps (GstBaseTransform * trans,
 static gboolean
 gst_comb_detect_start (GstBaseTransform * trans)
 {
-  /* GstCombDetect *combdetect = GST_COMB_DETECT (trans); */
+  GstCombDetect *combdetect = GST_COMB_DETECT (trans);
+
+  GST_DEBUG_OBJECT (combdetect, "start");
 
   /* initialize processing */
   return TRUE;
@@ -251,7 +257,9 @@ gst_comb_detect_start (GstBaseTransform * trans)
 static gboolean
 gst_comb_detect_stop (GstBaseTransform * trans)
 {
-  /* GstCombDetect *combdetect = GST_COMB_DETECT (trans); */
+  GstCombDetect *combdetect = GST_COMB_DETECT (trans);
+
+  GST_DEBUG_OBJECT (combdetect, "stop");
 
   /* finalize processing */
   return TRUE;

diff --git a/gst/ivtc/gstcombdetect.h b/gst/ivtc/gstcombdetect.h
index f845945..9b10989 100644 (file)
--- a/gst/ivtc/gstcombdetect.h
+++ b/gst/ivtc/gstcombdetect.h
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef _GST_COMB_DETECT_H_
@@ -37,8 +37,6 @@ typedef struct _GstCombDetectClass GstCombDetectClass;
 struct _GstCombDetect
 {
   GstVideoFilter base_combdetect;
-  GstPad *sinkpad;
-  GstPad *srcpad;
 
   GstVideoInfo vinfo;
 };

diff --git a/gst/ivtc/gstivtc.c b/gst/ivtc/gstivtc.c
index d26439b..27c8b33 100644 (file)
--- a/gst/ivtc/gstivtc.c
+++ b/gst/ivtc/gstivtc.c
@@ -70,40 +70,17 @@ static GstCaps *gst_ivtc_transform_caps (GstBaseTransform * trans,
     GstPadDirection direction, GstCaps * caps, GstCaps * filter);
 static GstCaps *gst_ivtc_fixate_caps (GstBaseTransform * trans,
     GstPadDirection direction, GstCaps * caps, GstCaps * othercaps);
-static gboolean gst_ivtc_accept_caps (GstBaseTransform * trans,
-    GstPadDirection direction, GstCaps * caps);
 static gboolean gst_ivtc_set_caps (GstBaseTransform * trans, GstCaps * incaps,
     GstCaps * outcaps);
-static gboolean gst_ivtc_query (GstBaseTransform * trans,
-    GstPadDirection direction, GstQuery * query);
-static gboolean gst_ivtc_decide_allocation (GstBaseTransform * trans,
-    GstQuery * query);
-static gboolean gst_ivtc_filter_meta (GstBaseTransform * trans,
-    GstQuery * query, GType api, const GstStructure * params);
-static gboolean gst_ivtc_propose_allocation (GstBaseTransform * trans,
-    GstQuery * decide_query, GstQuery * query);
 static gboolean gst_ivtc_transform_size (GstBaseTransform * trans,
     GstPadDirection direction, GstCaps * caps, gsize size, GstCaps * othercaps,
     gsize * othersize);
-static gboolean gst_ivtc_get_unit_size (GstBaseTransform * trans,
-    GstCaps * caps, gsize * size);
 static gboolean gst_ivtc_start (GstBaseTransform * trans);
 static gboolean gst_ivtc_stop (GstBaseTransform * trans);
 static gboolean gst_ivtc_sink_event (GstBaseTransform * trans,
     GstEvent * event);
-static gboolean gst_ivtc_src_event (GstBaseTransform * trans, GstEvent * event);
-static GstFlowReturn gst_ivtc_prepare_output_buffer (GstBaseTransform * trans,
-    GstBuffer * input, GstBuffer ** outbuf);
-static gboolean gst_ivtc_copy_metadata (GstBaseTransform * trans,
-    GstBuffer * input, GstBuffer * outbuf);
-static gboolean gst_ivtc_transform_meta (GstBaseTransform * trans,
-    GstBuffer * outbuf, GstMeta * meta, GstBuffer * inbuf);
-static void gst_ivtc_before_transform (GstBaseTransform * trans,
-    GstBuffer * buffer);
 static GstFlowReturn gst_ivtc_transform (GstBaseTransform * trans,
     GstBuffer * inbuf, GstBuffer * outbuf);
-static GstFlowReturn gst_ivtc_transform_ip (GstBaseTransform * trans,
-    GstBuffer * buf);
 static void gst_ivtc_flush (GstIvtc * ivtc);
 static void gst_ivtc_retire_fields (GstIvtc * ivtc, int n_fields);
 static void gst_ivtc_construct_frame (GstIvtc * itvc, GstBuffer * outbuf);
@@ -117,20 +94,26 @@ enum
 
 /* pad templates */
 
+#define MAX_WIDTH 2048
+#define VIDEO_CAPS \
+  "video/x-raw, " \
+  "format = (string) { I420, Y444, Y42B }, " \
+  "width = [1, 2048], " \
+  "height = " GST_VIDEO_SIZE_RANGE ", " \
+  "framerate = " GST_VIDEO_FPS_RANGE
+
 static GstStaticPadTemplate gst_ivtc_sink_template =
 GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{Y42B,I420,Y444}")
-        ",interlace-mode=(string){interleaved,mixed,progressive}")
+    GST_STATIC_CAPS (VIDEO_CAPS)
     );
 
 static GstStaticPadTemplate gst_ivtc_src_template =
 GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{Y42B,I420,Y444}")
-        ",interlace-mode=(string)progressive")
+    GST_STATIC_CAPS (VIDEO_CAPS)
     );
 
 
@@ -165,65 +148,27 @@ gst_ivtc_class_init (GstIvtcClass * klass)
   base_transform_class->transform_caps =
       GST_DEBUG_FUNCPTR (gst_ivtc_transform_caps);
   base_transform_class->fixate_caps = GST_DEBUG_FUNCPTR (gst_ivtc_fixate_caps);
-  if (0)
-    base_transform_class->accept_caps =
-        GST_DEBUG_FUNCPTR (gst_ivtc_accept_caps);
   base_transform_class->set_caps = GST_DEBUG_FUNCPTR (gst_ivtc_set_caps);
-  if (0)
-    base_transform_class->query = GST_DEBUG_FUNCPTR (gst_ivtc_query);
-  if (0)
-    base_transform_class->decide_allocation =
-        GST_DEBUG_FUNCPTR (gst_ivtc_decide_allocation);
-  if (0)
-    base_transform_class->filter_meta =
-        GST_DEBUG_FUNCPTR (gst_ivtc_filter_meta);
-  if (0)
-    base_transform_class->propose_allocation =
-        GST_DEBUG_FUNCPTR (gst_ivtc_propose_allocation);
   base_transform_class->transform_size =
       GST_DEBUG_FUNCPTR (gst_ivtc_transform_size);
-  if (0)
-    base_transform_class->get_unit_size =
-        GST_DEBUG_FUNCPTR (gst_ivtc_get_unit_size);
   base_transform_class->start = GST_DEBUG_FUNCPTR (gst_ivtc_start);
   base_transform_class->stop = GST_DEBUG_FUNCPTR (gst_ivtc_stop);
   base_transform_class->sink_event = GST_DEBUG_FUNCPTR (gst_ivtc_sink_event);
-  if (0)
-    base_transform_class->src_event = GST_DEBUG_FUNCPTR (gst_ivtc_src_event);
-  if (0)
-    base_transform_class->prepare_output_buffer =
-        GST_DEBUG_FUNCPTR (gst_ivtc_prepare_output_buffer);
-  if (0)
-    base_transform_class->copy_metadata =
-        GST_DEBUG_FUNCPTR (gst_ivtc_copy_metadata);
-  if (0)
-    base_transform_class->transform_meta =
-        GST_DEBUG_FUNCPTR (gst_ivtc_transform_meta);
-  if (0)
-    base_transform_class->before_transform =
-        GST_DEBUG_FUNCPTR (gst_ivtc_before_transform);
   base_transform_class->transform = GST_DEBUG_FUNCPTR (gst_ivtc_transform);
-  if (0)
-    base_transform_class->transform_ip =
-        GST_DEBUG_FUNCPTR (gst_ivtc_transform_ip);
 }
 
 static void
 gst_ivtc_init (GstIvtc * ivtc)
 {
-
-  ivtc->sinkpad = gst_pad_new_from_static_template (&gst_ivtc_sink_template,
-      "sink");
-
-  ivtc->srcpad = gst_pad_new_from_static_template (&gst_ivtc_src_template,
-      "src");
 }
 
 void
 gst_ivtc_set_property (GObject * object, guint property_id,
     const GValue * value, GParamSpec * pspec)
 {
-  /* GstIvtc *ivtc = GST_IVTC (object); */
+  GstIvtc *ivtc = GST_IVTC (object);
+
+  GST_DEBUG_OBJECT (ivtc, "set_property");
 
   switch (property_id) {
     default:
@@ -236,7 +181,9 @@ void
 gst_ivtc_get_property (GObject * object, guint property_id,
     GValue * value, GParamSpec * pspec)
 {
-  /* GstIvtc *ivtc = GST_IVTC (object); */
+  GstIvtc *ivtc = GST_IVTC (object);
+
+  GST_DEBUG_OBJECT (ivtc, "get_property");
 
   switch (property_id) {
     default:
@@ -248,7 +195,9 @@ gst_ivtc_get_property (GObject * object, guint property_id,
 void
 gst_ivtc_dispose (GObject * object)
 {
-  /* GstIvtc *ivtc = GST_IVTC (object); */
+  GstIvtc *ivtc = GST_IVTC (object);
+
+  GST_DEBUG_OBJECT (ivtc, "dispose");
 
   /* clean up as possible.  may be called multiple times */
 
@@ -258,14 +207,15 @@ gst_ivtc_dispose (GObject * object)
 void
 gst_ivtc_finalize (GObject * object)
 {
-  /* GstIvtc *ivtc = GST_IVTC (object); */
+  GstIvtc *ivtc = GST_IVTC (object);
+
+  GST_DEBUG_OBJECT (ivtc, "finalize");
 
   /* clean up object here */
 
   G_OBJECT_CLASS (gst_ivtc_parent_class)->finalize (object);
 }
 
-
 static GstCaps *
 gst_ivtc_transform_caps (GstBaseTransform * trans,
     GstPadDirection direction, GstCaps * caps, GstCaps * filter)
@@ -317,8 +267,8 @@ gst_ivtc_transform_caps (GstBaseTransform * trans,
 }
 
 static GstCaps *
-gst_ivtc_fixate_caps (GstBaseTransform * trans,
-    GstPadDirection direction, GstCaps * caps, GstCaps * othercaps)
+gst_ivtc_fixate_caps (GstBaseTransform * trans, GstPadDirection direction,
+    GstCaps * caps, GstCaps * othercaps)
 {
   GstCaps *result;
 
@@ -335,13 +285,6 @@ gst_ivtc_fixate_caps (GstBaseTransform * trans,
 }
 
 static gboolean
-gst_ivtc_accept_caps (GstBaseTransform * trans,
-    GstPadDirection direction, GstCaps * caps)
-{
-  return TRUE;
-}
-
-static gboolean
 gst_ivtc_set_caps (GstBaseTransform * trans, GstCaps * incaps,
     GstCaps * outcaps)
 {
@@ -358,57 +301,25 @@ gst_ivtc_set_caps (GstBaseTransform * trans, GstCaps * incaps,
   return TRUE;
 }
 
+/* transform size */
 static gboolean
-gst_ivtc_query (GstBaseTransform * trans, GstPadDirection direction,
-    GstQuery * query)
-{
-
-  return TRUE;
-}
-
-static gboolean
-gst_ivtc_decide_allocation (GstBaseTransform * trans, GstQuery * query)
-{
-
-  return TRUE;
-}
-
-static gboolean
-gst_ivtc_filter_meta (GstBaseTransform * trans, GstQuery * query,
-    GType api, const GstStructure * params)
-{
-
-  return TRUE;
-}
-
-static gboolean
-gst_ivtc_propose_allocation (GstBaseTransform * trans,
-    GstQuery * decide_query, GstQuery * query)
-{
-
-  return TRUE;
-}
-
-static gboolean
-gst_ivtc_transform_size (GstBaseTransform * trans,
-    GstPadDirection direction,
+gst_ivtc_transform_size (GstBaseTransform * trans, GstPadDirection direction,
     GstCaps * caps, gsize size, GstCaps * othercaps, gsize * othersize)
 {
-  *othersize = size;
-
-  return TRUE;
-}
+  GstIvtc *ivtc = GST_IVTC (trans);
 
-static gboolean
-gst_ivtc_get_unit_size (GstBaseTransform * trans, GstCaps * caps, gsize * size)
-{
+  GST_DEBUG_OBJECT (ivtc, "transform_size");
 
-  return FALSE;
+  return TRUE;
 }
 
+/* states */
 static gboolean
 gst_ivtc_start (GstBaseTransform * trans)
 {
+  GstIvtc *ivtc = GST_IVTC (trans);
+
+  GST_DEBUG_OBJECT (ivtc, "start");
 
   return TRUE;
 }
@@ -418,16 +329,20 @@ gst_ivtc_stop (GstBaseTransform * trans)
 {
   GstIvtc *ivtc = GST_IVTC (trans);
 
+  GST_DEBUG_OBJECT (ivtc, "stop");
   gst_ivtc_flush (ivtc);
 
   return TRUE;
 }
 
+/* sink and src pad event handlers */
 static gboolean
 gst_ivtc_sink_event (GstBaseTransform * trans, GstEvent * event)
 {
   GstIvtc *ivtc = GST_IVTC (trans);
 
+  GST_DEBUG_OBJECT (ivtc, "sink_event");
+
   if (GST_EVENT_TYPE (event) == GST_EVENT_SEGMENT) {
     const GstSegment *seg;
 
@@ -444,48 +359,11 @@ gst_ivtc_sink_event (GstBaseTransform * trans, GstEvent * event)
       event);
 }
 
-static gboolean
-gst_ivtc_src_event (GstBaseTransform * trans, GstEvent * event)
-{
-
-  return FALSE;
-}
-
-static GstFlowReturn
-gst_ivtc_prepare_output_buffer (GstBaseTransform * trans,
-    GstBuffer * input, GstBuffer ** buf)
-{
-
-  return GST_FLOW_ERROR;
-}
-
-static gboolean
-gst_ivtc_copy_metadata (GstBaseTransform * trans,
-    GstBuffer * input, GstBuffer * outbuf)
-{
-
-  return TRUE;
-}
-
-static gboolean
-gst_ivtc_transform_meta (GstBaseTransform * trans,
-    GstBuffer * outbuf, GstMeta * meta, GstBuffer * inbuf)
-{
-
-  return TRUE;
-}
-
-static void
-gst_ivtc_before_transform (GstBaseTransform * trans, GstBuffer * buffer)
-{
-
-
-}
-
 static void
 gst_ivtc_flush (GstIvtc * ivtc)
 {
-  /* FIXME need to send the fields to output */
+  GST_FIXME_OBJECT (ivtc, "not sending flushed fields to srcpad");
+
   gst_ivtc_retire_fields (ivtc, ivtc->n_fields);
 }
 
@@ -641,6 +519,8 @@ gst_ivtc_transform (GstBaseTransform * trans, GstBuffer * inbuf,
   GstIvtc *ivtc = GST_IVTC (trans);
   GstFlowReturn ret;
 
+  GST_DEBUG_OBJECT (ivtc, "transform");
+
   if (GST_BUFFER_FLAG_IS_SET (inbuf, GST_VIDEO_BUFFER_FLAG_TFF)) {
     add_field (ivtc, inbuf, TOP_FIELD, 0);
     if (!GST_BUFFER_FLAG_IS_SET (inbuf, GST_VIDEO_BUFFER_FLAG_ONEFIELD)) {
@@ -755,66 +635,11 @@ gst_ivtc_construct_frame (GstIvtc * ivtc, GstBuffer * outbuf)
 
 }
 
-static GstFlowReturn
-gst_ivtc_transform_ip (GstBaseTransform * trans, GstBuffer * buf)
-{
-
-  return GST_FLOW_ERROR;
-}
-
-#if 0
-static int
-get_comb_score (GstVideoFrame * top, GstVideoFrame * bottom)
-{
-  int k;
-  int height;
-  int width;
-  int j;
-#define MAXWIDTH 2048
-  guint8 thisline[MAXWIDTH];
-  guint8 prevline[MAXWIDTH];
-  int score = 0;
-
-
-  height = GST_VIDEO_FRAME_COMP_HEIGHT (top, 0);
-  width = GST_VIDEO_FRAME_COMP_WIDTH (top, 0);
-
-  g_assert (width <= MAXWIDTH);
-  memset (prevline, 0, MAXWIDTH);
-
-  k = 0;
-  for (j = 1; j < height - 1; j++) {
-    guint8 *src1 = GET_LINE_IL (top, bottom, 0, j - 1);
-    guint8 *src2 = GET_LINE_IL (top, bottom, 0, j);
-    guint8 *src3 = GET_LINE_IL (top, bottom, 0, j + 1);
-    int i;
-
-    for (i = 0; i < width; i++) {
-      if (src2[i] < MIN (src1[i], src3[i]) - 5 ||
-          src2[i] > MAX (src1[i], src3[i]) + 5) {
-        thisline[i] = 1;
-      } else {
-        thisline[i] = 0;
-      }
-      if (thisline[i] && (i > 0 && thisline[i - 1]) && prevline[i]) {
-        score++;
-      }
-    }
-
-    memcpy (prevline, thisline, MAXWIDTH);
-  }
-
-  GST_DEBUG ("score %d", score);
-
-  return score;
-}
-#else
 static int
 get_comb_score (GstVideoFrame * top, GstVideoFrame * bottom)
 {
   int j;
-#define MAXWIDTH 2048
-  int thisline[MAXWIDTH];
+  int thisline[MAX_WIDTH];
   int score = 0;
   int height;
   int width;
@@ -857,8 +682,6 @@ get_comb_score (GstVideoFrame * top, GstVideoFrame * bottom)
   return score;
 }
 
-#endif
-
 
 
 static gboolean

diff --git a/gst/ivtc/gstivtc.h b/gst/ivtc/gstivtc.h
index b4409cf..bf70760 100644 (file)
--- a/gst/ivtc/gstivtc.h
+++ b/gst/ivtc/gstivtc.h
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef _GST_IVTC_H_
@@ -49,9 +49,6 @@ struct _GstIvtc
 {
   GstBaseTransform base_ivtc;
 
-  GstPad *sinkpad;
-  GstPad *srcpad;
-
   GstSegment segment;
 
   GstVideoInfo sink_video_info;