ext/libpng/: Ported pngdec to 0.9

Original commit message from CVS:
2005-10-15  Julien MOUTTE  <julien@moutte.net>

* ext/libpng/Makefile.am:
* ext/libpng/gstpng.c: (plugin_init):
* ext/libpng/gstpngdec.c: (gst_pngdec_class_init),
(gst_pngdec_init), (user_read_data), (gst_pngdec_chain):
* ext/libpng/gstpngdec.h: Ported pngdec to 0.9

4 files changed, 75 insertions, 74 deletions

diff --git a/ext/libpng/Makefile.am b/ext/libpng/Makefile.am
index 911a3b80..5da26379 100644
--- a/ext/libpng/Makefile.am
+++ b/ext/libpng/Makefile.am
@@ -1,6 +1,6 @@
 plugin_LTLIBRARIES = libgstpng.la
 
-libgstpng_la_SOURCES = gstpng.c gstpngenc.c # gstpngdec.c
+libgstpng_la_SOURCES = gstpng.c gstpngenc.c gstpngdec.c
 libgstpng_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstpng_la_LIBADD = $(GST_LIBS) $(LIBPNG_LIBS)
 libgstpng_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/ext/libpng/gstpng.c b/ext/libpng/gstpng.c
index 7cd3c1dd..d9bcd1b6 100644
--- a/ext/libpng/gstpng.c
+++ b/ext/libpng/gstpng.c
@@ -29,9 +29,9 @@
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-/*   if (!gst_element_register (plugin, "pngdec", GST_RANK_PRIMARY, */
-/*           GST_TYPE_PNGDEC)) */
-/*     return FALSE; */
+  if (!gst_element_register (plugin, "pngdec", GST_RANK_PRIMARY,
+          GST_TYPE_PNGDEC))
+    return FALSE;
 
   if (!gst_element_register (plugin, "pngenc", GST_RANK_NONE, GST_TYPE_PNGENC))
     return FALSE;
diff --git a/ext/libpng/gstpngdec.c b/ext/libpng/gstpngdec.c
index cb19628b..f5b51b97 100644
--- a/ext/libpng/gstpngdec.c
+++ b/ext/libpng/gstpngdec.c
@@ -16,9 +16,10 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <string.h>
-#include <gst/gst.h>
+
 #include "gstpngdec.h"
+
+#include <string.h>
 #include <gst/video/video.h>
 
 static GstElementDetails gst_pngdec_details = {
@@ -28,28 +29,17 @@ static GstElementDetails gst_pngdec_details = {
   "Wim Taymans <wim@fluendo.com>",
 };
 
-
-/* Filter signals and args */
-enum
-{
-  /* FILL ME */
-  LAST_SIGNAL
-};
-
-enum
-{
-  ARG_0
-};
+GST_DEBUG_CATEGORY (pngdec_debug);
+#define GST_CAT_DEFAULT pngdec_debug
 
 static void gst_pngdec_base_init (gpointer g_class);
 static void gst_pngdec_class_init (GstPngDecClass * klass);
 static void gst_pngdec_init (GstPngDec * pngdec);
 
-static void gst_pngdec_chain (GstPad * pad, GstData * _data);
+static GstFlowReturn gst_pngdec_chain (GstPad * pad, GstBuffer * buf);
 
 static GstElementClass *parent_class = NULL;
 
-
 static void
 user_error_fn (png_structp png_ptr, png_const_charp error_msg)
 {
@@ -62,7 +52,6 @@ user_warning_fn (png_structp png_ptr, png_const_charp warning_msg)
   g_warning ("%s", warning_msg);
 }
 
-
 GType
 gst_pngdec_get_type (void)
 {
@@ -91,7 +80,7 @@ static GstStaticPadTemplate gst_pngdec_src_pad_template =
     GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_VIDEO_CAPS_BGRA ";" GST_VIDEO_CAPS_BGR)
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_RGBA ";" GST_VIDEO_CAPS_RGB)
     );
 
 static GstStaticPadTemplate gst_pngdec_sink_pad_template =
@@ -125,22 +114,11 @@ gst_pngdec_class_init (GstPngDecClass * klass)
   gstelement_class = (GstElementClass *) klass;
 
   parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
-}
-
-static GstPadLinkReturn
-gst_pngdec_sinklink (GstPad * pad, const GstCaps * caps)
-{
-  GstPngDec *pngdec;
-  GstStructure *structure;
-
-  pngdec = GST_PNGDEC (gst_pad_get_parent (pad));
 
-  structure = gst_caps_get_structure (caps, 0);
-  gst_structure_get_double (structure, "framerate", &pngdec->fps);
-
-  return TRUE;
+  GST_DEBUG_CATEGORY_INIT (pngdec_debug, "pngdec", 0, "PNG image decoder");
 }
 
+
 static void
 gst_pngdec_init (GstPngDec * pngdec)
 {
@@ -153,9 +131,6 @@ gst_pngdec_init (GstPngDec * pngdec)
   gst_element_add_pad (GST_ELEMENT (pngdec), pngdec->srcpad);
 
   gst_pad_set_chain_function (pngdec->sinkpad, gst_pngdec_chain);
-  gst_pad_set_link_function (pngdec->sinkpad, gst_pngdec_sinklink);
-
-  gst_pad_use_explicit_caps (pngdec->srcpad);
 
   pngdec->png = NULL;
   pngdec->info = NULL;
@@ -163,7 +138,7 @@ gst_pngdec_init (GstPngDec * pngdec)
   pngdec->color_type = -1;
   pngdec->width = -1;
   pngdec->height = -1;
-  pngdec->fps = -1;
+  pngdec->fps = 0.0;
 }
 
 static void
@@ -173,6 +148,8 @@ user_read_data (png_structp png_ptr, png_bytep data, png_size_t length)
 
   dec = GST_PNGDEC (png_ptr->io_ptr);
 
+  GST_LOG ("reading %d bytes of data at offset %d", length, dec->offset);
+
   if (GST_BUFFER_SIZE (dec->buffer_in) < dec->offset + length) {
     g_warning ("reading past end of buffer");
   }
@@ -182,10 +159,12 @@ user_read_data (png_structp png_ptr, png_bytep data, png_size_t length)
   dec->offset += length;
 }
 
-static void
-gst_pngdec_chain (GstPad * pad, GstData * _data)
+#define ROUND_UP_4(x) (((x) + 3) & ~3)
+
+static GstFlowReturn
+gst_pngdec_chain (GstPad * pad, GstBuffer * buf)
 {
-  GstBuffer *buf = GST_BUFFER (_data);
+  GstFlowReturn ret = GST_FLOW_OK;
   GstPngDec *pngdec;
   png_uint_32 width, height;
   gint depth, color;
@@ -193,11 +172,14 @@ gst_pngdec_chain (GstPad * pad, GstData * _data)
   GstBuffer *out;
   gint i;
 
+  GST_LOG ("chain");
+
   pngdec = GST_PNGDEC (gst_pad_get_parent (pad));
 
   if (!GST_PAD_IS_USABLE (pngdec->srcpad)) {
     gst_buffer_unref (buf);
-    return;
+    ret = GST_FLOW_UNEXPECTED;
+    goto beach;
   }
 
   pngdec->buffer_in = buf;
@@ -211,7 +193,8 @@ gst_pngdec_chain (GstPad * pad, GstData * _data)
     gst_buffer_unref (buf);
     GST_ELEMENT_ERROR (pngdec, LIBRARY, INIT, (NULL),
         ("Failed to initialize png structure"));
-    return;
+    ret = GST_FLOW_UNEXPECTED;
+    goto beach;
   }
 
   pngdec->info = png_create_info_struct (pngdec->png);
@@ -221,7 +204,8 @@ gst_pngdec_chain (GstPad * pad, GstData * _data)
         (png_infopp) NULL);
     GST_ELEMENT_ERROR (pngdec, LIBRARY, INIT, (NULL),
         ("Failed to initialize info structure"));
-    return;
+    ret = GST_FLOW_UNEXPECTED;
+    goto beach;
   }
 
   pngdec->endinfo = png_create_info_struct (pngdec->png);
@@ -230,7 +214,8 @@ gst_pngdec_chain (GstPad * pad, GstData * _data)
     png_destroy_read_struct (&pngdec->png, &pngdec->info, (png_infopp) NULL);
     GST_ELEMENT_ERROR (pngdec, LIBRARY, INIT, (NULL),
         ("Failed to initialize endinfo structure"));
-    return;
+    ret = GST_FLOW_UNEXPECTED;
+    goto beach;
   }
 
   /* non-0 return is from a longjmp inside of libpng */
@@ -239,7 +224,8 @@ gst_pngdec_chain (GstPad * pad, GstData * _data)
     png_destroy_read_struct (&pngdec->png, &pngdec->info, &pngdec->endinfo);
     GST_ELEMENT_ERROR (pngdec, LIBRARY, FAILED, (NULL),
         ("returning from longjmp"));
-    return;
+    ret = GST_FLOW_UNEXPECTED;
+    goto beach;
   }
 
   png_set_read_fn (pngdec->png, pngdec, user_read_data);
@@ -253,7 +239,8 @@ gst_pngdec_chain (GstPad * pad, GstData * _data)
     png_destroy_read_struct (&pngdec->png, &pngdec->info, &pngdec->endinfo);
     GST_ELEMENT_ERROR (pngdec, STREAM, NOT_IMPLEMENTED, (NULL),
         ("pngdec only supports 8 bit images for now"));
-    return;
+    ret = GST_FLOW_UNEXPECTED;
+    goto beach;
   }
 
   if (pngdec->width != width ||
@@ -263,24 +250,25 @@ gst_pngdec_chain (GstPad * pad, GstData * _data)
     gboolean ret;
     gint bpp;
 
+    GST_LOG ("this is a %dx%d PNG image", width, height);
     pngdec->width = width;
     pngdec->height = height;
     pngdec->color_type = pngdec->info->color_type;
 
-    templ = gst_caps_copy (gst_pad_template_get_caps
-        (gst_static_pad_template_get (&gst_pngdec_src_pad_template)));
-
     switch (pngdec->color_type) {
       case PNG_COLOR_TYPE_RGB:
+        GST_LOG ("we have no alpha channel, depth is 24 bits");
         bpp = 24;
         break;
       case PNG_COLOR_TYPE_RGB_ALPHA:
+        GST_LOG ("we have an alpha channel, depth is 32 bits");
         bpp = 32;
         break;
       default:
         GST_ELEMENT_ERROR (pngdec, STREAM, NOT_IMPLEMENTED, (NULL),
             ("pngdec does not support grayscale or paletted data yet"));
-        return;
+        ret = GST_FLOW_UNEXPECTED;
+        goto beach;
     }
 
     caps = gst_caps_new_simple ("video/x-raw-rgb",
@@ -288,29 +276,44 @@ gst_pngdec_chain (GstPad * pad, GstData * _data)
         "height", G_TYPE_INT, height,
         "bpp", G_TYPE_INT, bpp, "framerate", G_TYPE_DOUBLE, pngdec->fps, NULL);
 
+    templ = gst_caps_copy (gst_pad_template_get_caps
+        (gst_static_pad_template_get (&gst_pngdec_src_pad_template)));
+
     res = gst_caps_intersect (templ, caps);
-    gst_caps_free (caps);
-    gst_caps_free (templ);
-    ret = gst_pad_set_explicit_caps (pngdec->srcpad, res);
-    gst_caps_free (res);
+    gst_caps_unref (caps);
+    gst_caps_unref (templ);
+    {
+      gchar *caps_str = gst_caps_to_string (res);
+
+      GST_LOG ("intersecting caps with template gave %s", caps_str);
+      g_free (caps_str);
+    }
+    ret = gst_pad_set_caps (pngdec->srcpad, res);
+    gst_caps_unref (res);
 
     if (!ret) {
       gst_buffer_unref (buf);
       png_destroy_read_struct (&pngdec->png, &pngdec->info, &pngdec->endinfo);
       GST_ELEMENT_ERROR (pngdec, CORE, NEGOTIATION, (NULL), (NULL));
-      return;
+      ret = GST_FLOW_UNEXPECTED;
+      goto beach;
     }
   }
 
   rows = (png_bytep *) g_malloc (sizeof (png_bytep) * height);
 
-  out = gst_pad_alloc_buffer (pngdec->srcpad, GST_BUFFER_OFFSET_NONE,
-      height * pngdec->info->rowbytes);
+  ret = gst_pad_alloc_buffer (pngdec->srcpad, GST_BUFFER_OFFSET_NONE,
+      height * ROUND_UP_4 (pngdec->info->rowbytes),
+      GST_PAD_CAPS (pngdec->srcpad), &out);
+
+  if (ret != GST_FLOW_OK) {
+    goto beach;
+  }
 
   inp = GST_BUFFER_DATA (out);
   for (i = 0; i < height; i++) {
     rows[i] = inp;
-    inp += pngdec->info->rowbytes;
+    inp += ROUND_UP_4 (pngdec->info->rowbytes);
   }
 
   png_read_image (pngdec->png, rows);
@@ -322,5 +325,10 @@ gst_pngdec_chain (GstPad * pad, GstData * _data)
   pngdec->buffer_in = NULL;
   gst_buffer_unref (buf);
 
-  gst_pad_push (pngdec->srcpad, GST_DATA (out));
+  /* Pushing */
+  GST_LOG ("pushing our raw RGB frame");
+  ret = gst_pad_push (pngdec->srcpad, out);
+
+beach:
+  return ret;
 }
diff --git a/ext/libpng/gstpngdec.h b/ext/libpng/gstpngdec.h
index 1068c260..62232c48 100644
--- a/ext/libpng/gstpngdec.h
+++ b/ext/libpng/gstpngdec.h
@@ -24,16 +24,13 @@
 #include <gst/gst.h>
 #include <png.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
-
-#define GST_TYPE_PNGDEC  	(gst_pngdec_get_type())
-#define GST_PNGDEC(obj)  	(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PNGDEC,GstPngDec))
+#define GST_TYPE_PNGDEC (gst_pngdec_get_type())
+#define GST_PNGDEC(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PNGDEC,GstPngDec))
 #define GST_PNGDEC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PNGDEC,GstPngDec))
-#define GST_IS_PNGDEC(obj) 	(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PNGDEC))
-#define GST_IS_PNGDEC_CLASS(obj)(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PNGDEC))
+#define GST_IS_PNGDEC(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PNGDEC))
+#define GST_IS_PNGDEC_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PNGDEC))
 
 typedef struct _GstPngDec GstPngDec;
 typedef struct _GstPngDecClass GstPngDecClass;
@@ -65,10 +62,6 @@ struct _GstPngDecClass
 
 GType gst_pngdec_get_type(void);
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GST_PNGDEC_H__ */