From 63d4c89560d1a000059955ace56846a06afb9e46 Mon Sep 17 00:00:00 2001
From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Date: Thu, 1 Dec 2016 21:51:31 -0500
Subject: [PATCH] edgedetect: Remove redundant CAPS event handler

There is already a cv_set_caps() implemented, so just do the
entire work there.

https://bugzilla.gnome.org/show_bug.cgi?id=775377
---
 ext/opencv/gstedgedetect.cpp | 59 +++++-------------------------------
 1 file changed, 8 insertions(+), 51 deletions(-)

diff --git a/ext/opencv/gstedgedetect.cpp b/ext/opencv/gstedgedetect.cpp
index 1be9836a9c..b05aa31160 100644
--- a/ext/opencv/gstedgedetect.cpp
+++ b/ext/opencv/gstedgedetect.cpp
@@ -105,8 +105,6 @@ static void gst_edge_detect_set_property (GObject * object, guint prop_id,
 static void gst_edge_detect_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 
-static gboolean gst_edge_detect_handle_sink_event (GstPad * pad,
-    GstObject * parent, GstEvent * event);
 static GstFlowReturn gst_edge_detect_transform (GstOpencvVideoFilter * filter,
     GstBuffer * buf, IplImage * img, GstBuffer * outbuf, IplImage * outimg);
 static gboolean gst_edge_detect_set_caps (GstOpencvVideoFilter * transform,
@@ -181,9 +179,6 @@ gst_edge_detect_class_init (GstEdgeDetectClass * klass)
 static void
 gst_edge_detect_init (GstEdgeDetect * filter)
 {
-  gst_pad_set_event_function (GST_BASE_TRANSFORM_SINK_PAD (filter),
-      GST_DEBUG_FUNCPTR (gst_edge_detect_handle_sink_event));
-
   filter->mask = TRUE;
   filter->threshold1 = 50;
   filter->threshold2 = 150;
@@ -253,55 +248,17 @@ gst_edge_detect_set_caps (GstOpencvVideoFilter * transform,
 {
   GstEdgeDetect *filter = GST_EDGE_DETECT (transform);
 
-  if (filter->cvGray)
-    cvReleaseImage (&filter->cvGray);
-
-  filter->cvGray =
-      cvCreateImage (cvSize (in_width, in_height), IPL_DEPTH_8U, 1);
-
-  return TRUE;
-}
-
-/* this function handles the link with other elements */
-static gboolean
-gst_edge_detect_handle_sink_event (GstPad * pad, GstObject * parent,
-    GstEvent * event)
-{
-  GstEdgeDetect *filter;
-  gint width, height;
-  GstStructure *structure;
-  gboolean res = TRUE;
-
-  filter = GST_EDGE_DETECT (parent);
-
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_CAPS:
-    {
-      GstCaps *caps;
-      gst_event_parse_caps (event, &caps);
-
-      structure = gst_caps_get_structure (caps, 0);
-      gst_structure_get_int (structure, "width", &width);
-      gst_structure_get_int (structure, "height", &height);
-
-      if (filter->cvEdge != NULL) {
-        cvReleaseImage (&filter->cvCEdge);
-        cvReleaseImage (&filter->cvGray);
-        cvReleaseImage (&filter->cvEdge);
-      }
-
-      filter->cvCEdge = cvCreateImage (cvSize (width, height), IPL_DEPTH_8U, 3);
-      filter->cvGray = cvCreateImage (cvSize (width, height), IPL_DEPTH_8U, 1);
-      filter->cvEdge = cvCreateImage (cvSize (width, height), IPL_DEPTH_8U, 1);
-      break;
-    }
-    default:
-      break;
+  if (filter->cvEdge != NULL) {
+      cvReleaseImage (&filter->cvCEdge);
+      cvReleaseImage (&filter->cvGray);
+      cvReleaseImage (&filter->cvEdge);
   }
 
-  res = gst_pad_event_default (pad, parent, event);
+  filter->cvCEdge = cvCreateImage (cvSize (out_width, out_height), IPL_DEPTH_8U, out_channels);
+  filter->cvGray = cvCreateImage (cvSize (in_width, in_height), IPL_DEPTH_8U, 1);
+  filter->cvEdge = cvCreateImage (cvSize (in_width, in_height), IPL_DEPTH_8U, 1);
 
-  return res;
+  return TRUE;
 }
 
 static GstFlowReturn