annodex: port to 0.11

diff --git a/configure.ac b/configure.ac
index c41ec7ffc572c63f011f9ae56a4c8d61ca68470a..4ed7697b3bc7a22d5df182d50e203f979fe7fea1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -315,7 +315,7 @@ dnl Make sure you have a space before and after all plugins
 GST_PLUGINS_NONPORTED="deinterlace flx goom2k1 icydemux id3demux \
  imagefreeze interleave matroska monoscope smpte \
  videobox videocrop videomixer \
- annodex apetag cairo cairo_gobject dv1394 gdk_pixbuf libdv libpng \
+ apetag cairo cairo_gobject dv1394 gdk_pixbuf libdv libpng \
  oss oss4 shout2 \
  taglib wavpack "
 AC_SUBST(GST_PLUGINS_NONPORTED)

diff --git a/ext/annodex/gstcmmldec.c b/ext/annodex/gstcmmldec.c
index 79b267a639e99b9fe7fb9285750c83dd3bd08ae4..8af2fabe03364e1d24613c420d9c747337e3c4e9 100644 (file)
--- a/ext/annodex/gstcmmldec.c
+++ b/ext/annodex/gstcmmldec.c
@@ -83,7 +83,9 @@ GST_STATIC_PAD_TEMPLATE ("sink",
     );
 
 /* GstCmmlDec */
-GST_BOILERPLATE (GstCmmlDec, gst_cmml_dec, GstElement, GST_TYPE_ELEMENT);
+#define gst_cmml_dec_parent_class parent_class
+G_DEFINE_TYPE (GstCmmlDec, gst_cmml_dec, GST_TYPE_ELEMENT);
+
 static void gst_cmml_dec_get_property (GObject * dec, guint property_id,
     GValue * value, GParamSpec * pspec);
 static void gst_cmml_dec_set_property (GObject * dec, guint property_id,
@@ -98,13 +100,15 @@ static GstStateChangeReturn gst_cmml_dec_change_state (GstElement * element,
 static GstFlowReturn gst_cmml_dec_chain (GstPad * pad, GstBuffer * buffer);
 
 static GstCmmlPacketType gst_cmml_dec_parse_packet_type (GstCmmlDec * dec,
-    GstBuffer * buffer);
-static void gst_cmml_dec_parse_ident_header (GstCmmlDec * dec, GstBuffer * buf);
-static void gst_cmml_dec_parse_first_header (GstCmmlDec * dec, GstBuffer * buf);
-static void gst_cmml_dec_parse_preamble (GstCmmlDec * dec,
-    guchar * preamble, guchar * cmml_root_element);
-static void gst_cmml_dec_parse_xml (GstCmmlDec * dec,
-    guchar * data, guint size);
+    gchar * data, gsize size);
+static void gst_cmml_dec_parse_ident_header (GstCmmlDec * dec, guint8 * data,
+    gsize size);
+static void gst_cmml_dec_parse_first_header (GstCmmlDec * dec, guint8 * data,
+    gsize size);
+static void gst_cmml_dec_parse_preamble (GstCmmlDec * dec, guchar * preamble,
+    guchar * cmml_root_element);
+static void gst_cmml_dec_parse_xml (GstCmmlDec * dec, guchar * data,
+    guint size);
 static void gst_cmml_dec_parse_head (GstCmmlDec * dec, GstCmmlTagHead * head);
 static void gst_cmml_dec_parse_clip (GstCmmlDec * dec, GstCmmlTagClip * clip);
 
@@ -117,9 +121,23 @@ static void gst_cmml_dec_send_clip_tag (GstCmmlDec * dec,
 static void gst_cmml_dec_finalize (GObject * object);
 
 static void
-gst_cmml_dec_base_init (gpointer g_class)
+gst_cmml_dec_class_init (GstCmmlDecClass * klass)
 {
-  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+
+  object_class->set_property = gst_cmml_dec_set_property;
+  object_class->get_property = gst_cmml_dec_get_property;
+  object_class->finalize = gst_cmml_dec_finalize;
+
+  g_object_class_install_property (object_class, GST_CMML_DEC_WAIT_CLIP_END,
+      g_param_spec_boolean ("wait-clip-end-time",
+          "Wait clip end time",
+          "Send a tag for a clip when the clip ends, setting its end-time. "
+          "Use when you need to know both clip's start-time and end-time.",
+          FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  element_class->change_state = gst_cmml_dec_change_state;
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_cmml_dec_sink_factory));
@@ -131,26 +149,7 @@ gst_cmml_dec_base_init (gpointer g_class)
 }
 
 static void
-gst_cmml_dec_class_init (GstCmmlDecClass * dec_class)
-{
-  GObjectClass *klass = G_OBJECT_CLASS (dec_class);
-
-  GST_ELEMENT_CLASS (klass)->change_state = gst_cmml_dec_change_state;
-
-  klass->set_property = gst_cmml_dec_set_property;
-  klass->get_property = gst_cmml_dec_get_property;
-  klass->finalize = gst_cmml_dec_finalize;
-
-  g_object_class_install_property (klass, GST_CMML_DEC_WAIT_CLIP_END,
-      g_param_spec_boolean ("wait-clip-end-time",
-          "Wait clip end time",
-          "Send a tag for a clip when the clip ends, setting its end-time. "
-          "Use when you need to know both clip's start-time and end-time.",
-          FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-}
-
-static void
-gst_cmml_dec_init (GstCmmlDec * dec, GstCmmlDecClass * klass)
+gst_cmml_dec_init (GstCmmlDec * dec)
 {
   dec->sinkpad =
       gst_pad_new_from_static_template (&gst_cmml_dec_sink_factory, "sink");
@@ -240,7 +239,7 @@ gst_cmml_dec_change_state (GstElement * element, GstStateChange transition)
       break;
   }
 
-  res = parent_class->change_state (element, transition);
+  res = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
   switch (transition) {
     case GST_STATE_CHANGE_PAUSED_TO_READY:
@@ -369,8 +368,12 @@ gst_cmml_dec_chain (GstPad * pad, GstBuffer * buffer)
 {
   GstCmmlDec *dec = GST_CMML_DEC (GST_PAD_PARENT (pad));
   GstCmmlPacketType packet;
+  guint8 *data;
+  gsize size;
+
+  data = gst_buffer_map (buffer, &size, NULL, GST_MAP_READ);
 
-  if (GST_BUFFER_SIZE (buffer) == 0) {
+  if (size == 0) {
     /* the EOS page could be empty */
     dec->flow_return = GST_FLOW_OK;
     goto done;
@@ -381,25 +384,24 @@ gst_cmml_dec_chain (GstPad * pad, GstBuffer * buffer)
       dec->granulerate_n, dec->granulerate_d, dec->granuleshift);
 
   /* identify the packet type */
-  packet = gst_cmml_dec_parse_packet_type (dec, buffer);
+  packet = gst_cmml_dec_parse_packet_type (dec, (gchar *) data, size);
 
   /* handle the packet. the handler will set dec->flow_return */
   switch (packet) {
     case GST_CMML_PACKET_IDENT_HEADER:
       if (dec->sent_root == FALSE)
         /* don't parse the ident again in case of seeking to the beginning */
-        gst_cmml_dec_parse_ident_header (dec, buffer);
+        gst_cmml_dec_parse_ident_header (dec, data, size);
       break;
     case GST_CMML_PACKET_FIRST_HEADER:
       if (dec->sent_root == FALSE)
         /* don't parse the xml preamble if it has already been parsed because it
          * would error out, so seeking to the beginning would fail */
-        gst_cmml_dec_parse_first_header (dec, buffer);
+        gst_cmml_dec_parse_first_header (dec, data, size);
       break;
     case GST_CMML_PACKET_SECOND_HEADER:
     case GST_CMML_PACKET_CLIP:
-      gst_cmml_dec_parse_xml (dec,
-          GST_BUFFER_DATA (buffer), GST_BUFFER_SIZE (buffer));
+      gst_cmml_dec_parse_xml (dec, data, size);
       break;
     case GST_CMML_PACKET_UNKNOWN:
     default:
@@ -408,18 +410,18 @@ gst_cmml_dec_chain (GstPad * pad, GstBuffer * buffer)
   }
 
 done:
+  gst_buffer_unmap (buffer, data, size);
   gst_buffer_unref (buffer);
+
   return dec->flow_return;
 }
 
 /* finds the packet type of the buffer
  */
 static GstCmmlPacketType
-gst_cmml_dec_parse_packet_type (GstCmmlDec * dec, GstBuffer * buffer)
+gst_cmml_dec_parse_packet_type (GstCmmlDec * dec, gchar * data, gsize size)
 {
   GstCmmlPacketType packet_type = GST_CMML_PACKET_UNKNOWN;
-  gchar *data = (gchar *) GST_BUFFER_DATA (buffer);
-  guint size = GST_BUFFER_SIZE (buffer);
 
   if (size >= 8 && !memcmp (data, "CMML\0\0\0\0", 8)) {
     packet_type = GST_CMML_PACKET_IDENT_HEADER;
@@ -443,19 +445,15 @@ gst_cmml_dec_new_buffer (GstCmmlDec * dec,
 {
   GstFlowReturn res;
 
-  res = gst_pad_alloc_buffer (dec->srcpad, GST_BUFFER_OFFSET_NONE,
-      size, gst_static_pad_template_get_caps (&gst_cmml_dec_src_factory),
-      buffer);
-
-  if (res == GST_FLOW_OK) {
+  *buffer = gst_buffer_new_allocate (NULL, size, 0);
+  if (*buffer != NULL) {
     if (data)
-      memcpy (GST_BUFFER_DATA (*buffer), data, size);
+      gst_buffer_fill (*buffer, 0, data, size);
     GST_BUFFER_TIMESTAMP (*buffer) = dec->timestamp;
-  } else if (res == GST_FLOW_NOT_LINKED) {
-    GST_DEBUG_OBJECT (dec, "alloc function return NOT-LINKED, ignoring");
+    res = GST_FLOW_OK;
   } else {
-    GST_WARNING_OBJECT (dec, "alloc function returned error %s",
-        gst_flow_get_name (res));
+    GST_WARNING_OBJECT (dec, "could not allocate buffer");
+    res = GST_FLOW_ERROR;
   }
 
   return res;
@@ -464,14 +462,12 @@ gst_cmml_dec_new_buffer (GstCmmlDec * dec,
 /* parses the first CMML packet (the ident header)
  */
 static void
-gst_cmml_dec_parse_ident_header (GstCmmlDec * dec, GstBuffer * buffer)
+gst_cmml_dec_parse_ident_header (GstCmmlDec * dec, guint8 * data, gsize size)
 {
-  guint8 *data = GST_BUFFER_DATA (buffer);
-
   /* the ident header has a fixed length */
-  if (GST_BUFFER_SIZE (buffer) != CMML_IDENT_HEADER_SIZE) {
+  if (size != CMML_IDENT_HEADER_SIZE) {
     GST_ELEMENT_ERROR (dec, STREAM, DECODE,
-        (NULL), ("wrong ident header size: %d", GST_BUFFER_SIZE (buffer)));
+        (NULL), ("wrong ident header size: %d", size));
     dec->flow_return = GST_FLOW_ERROR;
 
     return;
@@ -503,17 +499,15 @@ gst_cmml_dec_parse_ident_header (GstCmmlDec * dec, GstBuffer * buffer)
  * optional "cmml" processing instruction.
  */
 static void
-gst_cmml_dec_parse_first_header (GstCmmlDec * dec, GstBuffer * buffer)
+gst_cmml_dec_parse_first_header (GstCmmlDec * dec, guint8 * data, gsize size)
 {
-  gst_cmml_dec_parse_xml (dec,
-      GST_BUFFER_DATA (buffer), GST_BUFFER_SIZE (buffer));
+  gst_cmml_dec_parse_xml (dec, data, size);
 
   /* if there is a processing instruction, gst_cmml_dec_parse_preamble
    * will be triggered. Otherwise we need to call it manually.
    */
   if (dec->flow_return == GST_FLOW_OK && !dec->sent_root) {
-    guchar *preamble = (guchar *) g_strndup ((gchar *) GST_BUFFER_DATA (buffer),
-        GST_BUFFER_SIZE (buffer));
+    guchar *preamble = (guchar *) g_strndup ((gchar *) data, size);
 
     gst_cmml_dec_parse_preamble (dec, preamble, (guchar *) "<cmml>");
     g_free (preamble);

diff --git a/ext/annodex/gstcmmlenc.c b/ext/annodex/gstcmmlenc.c
index a3255dc87aed8fb4f285e341f979691ca41d2f1f..4b7356ce9bcd90718d5f91fa6e93b300f0517e9b 100644 (file)
--- a/ext/annodex/gstcmmlenc.c
+++ b/ext/annodex/gstcmmlenc.c
@@ -79,7 +79,9 @@ GST_STATIC_PAD_TEMPLATE ("sink",
     GST_STATIC_CAPS ("text/x-cmml, encoded = (boolean) false")
     );
 
-GST_BOILERPLATE (GstCmmlEnc, gst_cmml_enc, GstElement, GST_TYPE_ELEMENT);
+#define gst_cmml_enc_parent_class parent_class
+G_DEFINE_TYPE (GstCmmlEnc, gst_cmml_enc, GST_TYPE_ELEMENT);
+
 static void gst_cmml_enc_get_property (GObject * object, guint property_id,
     GValue * value, GParamSpec * pspec);
 static void gst_cmml_enc_set_property (GObject * object, guint property_id,
@@ -103,24 +105,11 @@ static GstFlowReturn gst_cmml_enc_push (GstCmmlEnc * enc, GstBuffer * buffer);
 
 static void gst_cmml_enc_finalize (GObject * object);
 
-static void
-gst_cmml_enc_base_init (gpointer g_class)
-{
-  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
-
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_cmml_enc_sink_factory));
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_cmml_enc_src_factory));
-  gst_element_class_set_details_simple (element_class, "CMML streams encoder",
-      "Codec/Encoder",
-      "Encodes CMML streams", "Alessandro Decina <alessandro@nnva.org>");
-}
-
 static void
 gst_cmml_enc_class_init (GstCmmlEncClass * enc_class)
 {
   GObjectClass *klass = G_OBJECT_CLASS (enc_class);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (enc_class);
 
   klass->get_property = gst_cmml_enc_get_property;
   klass->set_property = gst_cmml_enc_set_property;
@@ -147,11 +136,19 @@ gst_cmml_enc_class_init (GstCmmlEncClass * enc_class)
           0, 64, 32,
           G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
 
-  GST_ELEMENT_CLASS (klass)->change_state = gst_cmml_enc_change_state;
+  element_class->change_state = gst_cmml_enc_change_state;
+
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_cmml_enc_sink_factory));
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_cmml_enc_src_factory));
+  gst_element_class_set_details_simple (element_class, "CMML streams encoder",
+      "Codec/Encoder",
+      "Encodes CMML streams", "Alessandro Decina <alessandro@nnva.org>");
 }
 
 static void
-gst_cmml_enc_init (GstCmmlEnc * enc, GstCmmlEncClass * klass)
+gst_cmml_enc_init (GstCmmlEnc * enc)
 {
   enc->sinkpad =
       gst_pad_new_from_static_template (&gst_cmml_enc_sink_factory, "sink");
@@ -250,7 +247,7 @@ gst_cmml_enc_change_state (GstElement * element, GstStateChange transition)
       break;
   }
 
-  res = parent_class->change_state (element, transition);
+  res = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
   switch (transition) {
     case GST_STATE_CHANGE_PAUSED_TO_READY:
@@ -295,14 +292,14 @@ gst_cmml_enc_new_buffer (GstCmmlEnc * enc,
 {
   GstFlowReturn res;
 
-  res = gst_pad_alloc_buffer (enc->srcpad, GST_BUFFER_OFFSET_NONE, size,
-      NULL, buffer);
-  if (res == GST_FLOW_OK) {
+  *buffer = gst_buffer_new_allocate (NULL, size, 0);
+  if (*buffer != NULL) {
     if (data)
-      memcpy (GST_BUFFER_DATA (*buffer), data, size);
+      gst_buffer_fill (*buffer, 0, data, size);
+    res = GST_FLOW_OK;
   } else {
-    GST_WARNING_OBJECT (enc, "alloc function returned error %s",
-        gst_flow_get_name (res));
+    GST_WARNING_OBJECT (enc, "could not allocate buffer");
+    res = GST_FLOW_ERROR;
   }
 
   return res;
@@ -443,7 +440,7 @@ gst_cmml_enc_parse_tag_head (GstCmmlEnc * enc, GstCmmlTagHead * head)
     goto alloc_error;
   headers = g_list_append (headers, head_buf);
 
-  caps = gst_pad_get_caps (enc->srcpad);
+  caps = gst_pad_get_current_caps (enc->srcpad);
   caps = gst_cmml_enc_set_header_on_caps (enc, caps,
       ident_buf, preamble_buf, head_buf);
 
@@ -451,7 +448,6 @@ gst_cmml_enc_parse_tag_head (GstCmmlEnc * enc, GstCmmlTagHead * head)
     buffer = GST_BUFFER (headers->data);
     /* set granulepos 0 on headers */
     GST_BUFFER_OFFSET_END (buffer) = 0;
-    gst_buffer_set_caps (buffer, caps);
 
     enc->flow_return = gst_cmml_enc_push (enc, buffer);
     headers = g_list_delete_link (headers, headers);
@@ -600,19 +596,23 @@ gst_cmml_enc_chain (GstPad * pad, GstBuffer * buffer)
 {
   GError *err = NULL;
   GstCmmlEnc *enc = GST_CMML_ENC (GST_PAD_PARENT (pad));
+  gchar *data;
+  gsize size;
 
   /* the CMML handlers registered with enc->parser will override this when
    * encoding/pushing the buffers downstream
    */
   enc->flow_return = GST_FLOW_OK;
 
-  if (!gst_cmml_parser_parse_chunk (enc->parser,
-          (gchar *) GST_BUFFER_DATA (buffer), GST_BUFFER_SIZE (buffer), &err)) {
+  data = gst_buffer_map (buffer, &size, NULL, GST_MAP_READ);
+
+  if (!gst_cmml_parser_parse_chunk (enc->parser, data, size, &err)) {
     GST_ELEMENT_ERROR (enc, STREAM, ENCODE, (NULL), ("%s", err->message));
     g_error_free (err);
     enc->flow_return = GST_FLOW_ERROR;
   }
 
+  gst_buffer_unmap (buffer, data, size);
   gst_buffer_unref (buffer);
   return enc->flow_return;
 }