1 files changed, 30 insertions, 57 deletions

diff --git a/gst/effectv/gstripple.c b/gst/effectv/gstripple.c
index 170fd3a65..c48a8fde6 100644
--- a/gst/effectv/gstripple.c
+++ b/gst/effectv/gstripple.c
@@ -139,9 +139,12 @@ image_bgset_y (guint32 * src, gint16 * background, gint video_area)
 static gint
 setBackground (GstRippleTV * filter, guint32 * src)
 {
+  GstVideoInfo *info;
+
+  info = &GST_VIDEO_FILTER (filter)->in_info;
+
   image_bgset_y (src, filter->background,
-      GST_VIDEO_INFO_WIDTH (&filter->info) *
-      GST_VIDEO_INFO_HEIGHT (&filter->info));
+      GST_VIDEO_INFO_WIDTH (info) * GST_VIDEO_INFO_HEIGHT (info));
   filter->bg_is_set = TRUE;
 
   return 0;
@@ -182,9 +185,12 @@ motiondetect (GstRippleTV * filter, guint32 * src)
   gint width, height;
   gint *p, *q;
   gint x, y, h;
+  GstVideoInfo *info;
 
-  width = GST_VIDEO_INFO_WIDTH (&filter->info);
-  height = GST_VIDEO_INFO_HEIGHT (&filter->info);
+  info = &GST_VIDEO_FILTER (filter)->in_info;
+
+  width = GST_VIDEO_INFO_WIDTH (info);
+  height = GST_VIDEO_INFO_HEIGHT (info);
 
   if (!filter->bg_is_set)
     setBackground (filter, src);
@@ -304,12 +310,11 @@ raindrop (GstRippleTV * filter)
 }
 
 static GstFlowReturn
-gst_rippletv_transform (GstBaseTransform * trans, GstBuffer * in,
-    GstBuffer * out)
+gst_rippletv_transform_frame (GstVideoFilter * vfilter,
+    GstVideoFrame * in_frame, GstVideoFrame * out_frame)
 {
-  GstRippleTV *filter = GST_RIPPLETV (trans);
+  GstRippleTV *filter = GST_RIPPLETV (vfilter);
   guint32 *src, *dest;
-  GstVideoFrame in_frame, out_frame;
   gint x, y, i;
   gint dx, dy, o_dx;
   gint h, v;
@@ -318,9 +323,10 @@ gst_rippletv_transform (GstBaseTransform * trans, GstBuffer * in,
   gint8 *vp;
   GstClockTime timestamp, stream_time;
 
-  timestamp = GST_BUFFER_TIMESTAMP (in);
+  timestamp = GST_BUFFER_TIMESTAMP (in_frame->buffer);
   stream_time =
-      gst_segment_to_stream_time (&trans->segment, GST_FORMAT_TIME, timestamp);
+      gst_segment_to_stream_time (&GST_BASE_TRANSFORM (vfilter)->segment,
+      GST_FORMAT_TIME, timestamp);
 
   GST_DEBUG_OBJECT (filter, "sync to %" GST_TIME_FORMAT,
       GST_TIME_ARGS (timestamp));
@@ -328,14 +334,8 @@ gst_rippletv_transform (GstBaseTransform * trans, GstBuffer * in,
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
     gst_object_sync_values (GST_OBJECT (filter), stream_time);
 
-  if (!gst_video_frame_map (&in_frame, &filter->info, in, GST_MAP_READ))
-    goto invalid_in;
-
-  if (!gst_video_frame_map (&out_frame, &filter->info, out, GST_MAP_WRITE))
-    goto invalid_out;
-
-  src = GST_VIDEO_FRAME_PLANE_DATA (&in_frame, 0);
-  dest = GST_VIDEO_FRAME_PLANE_DATA (&out_frame, 0);
+  src = GST_VIDEO_FRAME_PLANE_DATA (in_frame, 0);
+  dest = GST_VIDEO_FRAME_PLANE_DATA (out_frame, 0);
 
   GST_OBJECT_LOCK (filter);
   /* impact from the motion or rain drop */
@@ -346,8 +346,8 @@ gst_rippletv_transform (GstBaseTransform * trans, GstBuffer * in,
 
   m_w = filter->map_w;
   m_h = filter->map_h;
-  v_w = GST_VIDEO_FRAME_WIDTH (&in_frame);
-  v_h = GST_VIDEO_FRAME_HEIGHT (&in_frame);
+  v_w = GST_VIDEO_FRAME_WIDTH (in_frame);
+  v_h = GST_VIDEO_FRAME_HEIGHT (in_frame);
 
   /* simulate surface wave */
 
@@ -441,41 +441,18 @@ gst_rippletv_transform (GstBaseTransform * trans, GstBuffer * in,
   }
   GST_OBJECT_UNLOCK (filter);
 
-  gst_video_frame_unmap (&in_frame);
-  gst_video_frame_unmap (&out_frame);
-
   return GST_FLOW_OK;
-
-  /* ERRORS */
-invalid_in:
-  {
-    GST_DEBUG_OBJECT (filter, "invalid input frame");
-    return GST_FLOW_ERROR;
-  }
-invalid_out:
-  {
-    GST_DEBUG_OBJECT (filter, "invalid output frame");
-    gst_video_frame_unmap (&in_frame);
-    return GST_FLOW_ERROR;
-  }
-
 }
 
 static gboolean
-gst_rippletv_set_caps (GstBaseTransform * btrans, GstCaps * incaps,
-    GstCaps * outcaps)
+gst_rippletv_set_info (GstVideoFilter * vfilter, GstCaps * incaps,
+    GstVideoInfo * in_info, GstCaps * outcaps, GstVideoInfo * out_info)
 {
-  GstRippleTV *filter = GST_RIPPLETV (btrans);
-  GstVideoInfo info;
+  GstRippleTV *filter = GST_RIPPLETV (vfilter);
   gint width, height;
 
-  if (!gst_video_info_from_caps (&info, incaps))
-    goto invalid_caps;
-
-  filter->info = info;
-
-  width = GST_VIDEO_INFO_WIDTH (&info);
-  height = GST_VIDEO_INFO_HEIGHT (&info);
+  width = GST_VIDEO_INFO_WIDTH (in_info);
+  height = GST_VIDEO_INFO_HEIGHT (in_info);
 
   GST_OBJECT_LOCK (filter);
   filter->map_h = height / 2 + 1;
@@ -505,13 +482,6 @@ gst_rippletv_set_caps (GstBaseTransform * btrans, GstCaps * incaps,
   GST_OBJECT_UNLOCK (filter);
 
   return TRUE;
-
-  /* ERRORS */
-invalid_caps:
-  {
-    GST_DEBUG_OBJECT (filter, "invalid caps received");
-    return FALSE;
-  }
 }
 
 static gboolean
@@ -601,6 +571,7 @@ gst_rippletv_class_init (GstRippleTVClass * klass)
   GObjectClass *gobject_class = (GObjectClass *) klass;
   GstElementClass *gstelement_class = (GstElementClass *) klass;
   GstBaseTransformClass *trans_class = (GstBaseTransformClass *) klass;
+  GstVideoFilterClass *vfilter_class = (GstVideoFilterClass *) klass;
 
   gobject_class->set_property = gst_rippletv_set_property;
   gobject_class->get_property = gst_rippletv_get_property;
@@ -628,10 +599,12 @@ gst_rippletv_class_init (GstRippleTVClass * klass)
   gst_element_class_add_pad_template (gstelement_class,
       gst_static_pad_template_get (&gst_rippletv_src_template));
 
-  trans_class->set_caps = GST_DEBUG_FUNCPTR (gst_rippletv_set_caps);
-  trans_class->transform = GST_DEBUG_FUNCPTR (gst_rippletv_transform);
   trans_class->start = GST_DEBUG_FUNCPTR (gst_rippletv_start);
 
+  vfilter_class->set_info = GST_DEBUG_FUNCPTR (gst_rippletv_set_info);
+  vfilter_class->transform_frame =
+      GST_DEBUG_FUNCPTR (gst_rippletv_transform_frame);
+
   setTable ();
 }