X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gst%2Fdeinterlace%2Ftvtime%2Fweavetff.c;h=3c60613dd70769d358db836216e337b4f79db3aa;hb=HEAD;hp=b645b0b905db561b475e7b055b2043298676040b;hpb=b1065bf2a5159183bde18dcd95c988ea42b86f83;p=framework%2Fmultimedia%2Fgst-plugins-good0.10.git

diff --git a/gst/deinterlace/tvtime/weavetff.c b/gst/deinterlace/tvtime/weavetff.c
index b645b0b..3c60613 100644
--- a/gst/deinterlace/tvtime/weavetff.c
+++ b/gst/deinterlace/tvtime/weavetff.c
@@ -49,76 +49,72 @@ static void
 deinterlace_scanline_weave_packed (GstDeinterlaceSimpleMethod * self,
     guint8 * out, const GstDeinterlaceScanlineData * scanlines)
 {
-  memcpy (out, scanlines->m1, self->parent.row_stride[0]);
+  if (scanlines->m1 == NULL) {
+    memcpy (out, scanlines->t0, self->parent.row_stride[0]);
+  } else {
+    memcpy (out, scanlines->m1, self->parent.row_stride[0]);
+  }
 }
 
 static void
 deinterlace_scanline_weave_planar_y (GstDeinterlaceSimpleMethod * self,
     guint8 * out, const GstDeinterlaceScanlineData * scanlines)
 {
-  memcpy (out, scanlines->m1, self->parent.row_stride[0]);
+  if (scanlines->m1 == NULL) {
+    memcpy (out, scanlines->t0, self->parent.row_stride[0]);
+  } else {
+    memcpy (out, scanlines->m1, self->parent.row_stride[0]);
+  }
 }
 
 static void
 deinterlace_scanline_weave_planar_u (GstDeinterlaceSimpleMethod * self,
     guint8 * out, const GstDeinterlaceScanlineData * scanlines)
 {
-  memcpy (out, scanlines->m1, self->parent.row_stride[1]);
+  if (scanlines->m1 == NULL) {
+    memcpy (out, scanlines->t0, self->parent.row_stride[1]);
+  } else {
+    memcpy (out, scanlines->m1, self->parent.row_stride[1]);
+  }
 }
 
 static void
 deinterlace_scanline_weave_planar_v (GstDeinterlaceSimpleMethod * self,
     guint8 * out, const GstDeinterlaceScanlineData * scanlines)
 {
-  memcpy (out, scanlines->m1, self->parent.row_stride[2]);
+  if (scanlines->m1 == NULL) {
+    memcpy (out, scanlines->t0, self->parent.row_stride[2]);
+  } else {
+    memcpy (out, scanlines->m1, self->parent.row_stride[2]);
+  }
 }
 
 static void
 copy_scanline_packed (GstDeinterlaceSimpleMethod * self,
     guint8 * out, const GstDeinterlaceScanlineData * scanlines)
 {
-  /* FIXME: original code used m2 and m0 but this looks really bad */
-  if (scanlines->bottom_field) {
-    memcpy (out, scanlines->bb0, self->parent.row_stride[0]);
-  } else {
-    memcpy (out, scanlines->bb2, self->parent.row_stride[0]);
-  }
+  memcpy (out, scanlines->m0, self->parent.row_stride[0]);
 }
 
 static void
 copy_scanline_planar_y (GstDeinterlaceSimpleMethod * self,
     guint8 * out, const GstDeinterlaceScanlineData * scanlines)
 {
-  /* FIXME: original code used m2 and m0 but this looks really bad */
-  if (scanlines->bottom_field) {
-    memcpy (out, scanlines->bb0, self->parent.row_stride[0]);
-  } else {
-    memcpy (out, scanlines->bb2, self->parent.row_stride[0]);
-  }
+  memcpy (out, scanlines->m0, self->parent.row_stride[0]);
 }
 
 static void
 copy_scanline_planar_u (GstDeinterlaceSimpleMethod * self,
     guint8 * out, const GstDeinterlaceScanlineData * scanlines)
 {
-  /* FIXME: original code used m2 and m0 but this looks really bad */
-  if (scanlines->bottom_field) {
-    memcpy (out, scanlines->bb0, self->parent.row_stride[1]);
-  } else {
-    memcpy (out, scanlines->bb2, self->parent.row_stride[1]);
-  }
+  memcpy (out, scanlines->m0, self->parent.row_stride[1]);
 }
 
 static void
 copy_scanline_planar_v (GstDeinterlaceSimpleMethod * self,
     guint8 * out, const GstDeinterlaceScanlineData * scanlines)
 {
-  /* FIXME: original code used m2 and m0 but this looks really bad */
-  if (scanlines->bottom_field) {
-    memcpy (out, scanlines->bb0, self->parent.row_stride[2]);
-  } else {
-    memcpy (out, scanlines->bb2, self->parent.row_stride[2]);
-  }
+  memcpy (out, scanlines->m0, self->parent.row_stride[2]);
 }
 
 G_DEFINE_TYPE (GstDeinterlaceMethodWeaveTFF, gst_deinterlace_method_weave_tff,
@@ -132,10 +128,10 @@ gst_deinterlace_method_weave_tff_class_init (GstDeinterlaceMethodWeaveTFFClass *
   GstDeinterlaceSimpleMethodClass *dism_class =
       (GstDeinterlaceSimpleMethodClass *) klass;
 
-  dim_class->fields_required = 3;
+  dim_class->fields_required = 2;
   dim_class->name = "Progressive: Top Field First";
   dim_class->nick = "weavetff";
-  dim_class->latency = 0;
+  dim_class->latency = 1;
 
   dism_class->interpolate_scanline_ayuv = deinterlace_scanline_weave_packed;
   dism_class->interpolate_scanline_yuy2 = deinterlace_scanline_weave_packed;