1 files changed, 27 insertions, 29 deletions

diff --git a/ext/voamrwbenc/gstvoamrwbenc.c b/ext/voamrwbenc/gstvoamrwbenc.c
index f29e71ecb..0f40fb3c2 100644
--- a/ext/voamrwbenc/gstvoamrwbenc.c
+++ b/ext/voamrwbenc/gstvoamrwbenc.c
@@ -91,11 +91,9 @@ enum
 static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("audio/x-raw-int, "
-        "width = (int) 16, "
-        "depth = (int) 16, "
-        "signed = (boolean) TRUE, "
-        "endianness = (int) BYTE_ORDER, "
+    GST_STATIC_CAPS ("audio/x-raw, "
+        "format = (string) " GST_AUDIO_NE (S16) ", "
+        "layout = (string) interleaved, "
         "rate = (int) 16000, " "channels = (int) 1")
     );
 
@@ -116,8 +114,7 @@ static gboolean gst_voamrwbenc_set_format (GstAudioEncoder * enc,
 static GstFlowReturn gst_voamrwbenc_handle_frame (GstAudioEncoder * enc,
     GstBuffer * in_buf);
 
-GST_BOILERPLATE (GstVoAmrWbEnc, gst_voamrwbenc, GstAudioEncoder,
-    GST_TYPE_AUDIO_ENCODER);
+G_DEFINE_TYPE (GstVoAmrWbEnc, gst_voamrwbenc, GST_TYPE_AUDIO_ENCODER);
 
 static void
 gst_voamrwbenc_set_property (GObject * object, guint prop_id,
@@ -156,28 +153,24 @@ gst_voamrwbenc_get_property (GObject * object, guint prop_id,
 }
 
 static void
-gst_voamrwbenc_base_init (gpointer klass)
+gst_voamrwbenc_class_init (GstVoAmrWbEncClass * klass)
 {
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstAudioEncoderClass *base_class = GST_AUDIO_ENCODER_CLASS (klass);
 
-  gst_element_class_add_static_pad_template (element_class,
-      &sink_template);
-  gst_element_class_add_static_pad_template (element_class, &src_template);
+  object_class->set_property = gst_voamrwbenc_set_property;
+  object_class->get_property = gst_voamrwbenc_get_property;
+
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&sink_template));
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&src_template));
 
   gst_element_class_set_details_simple (element_class, "AMR-WB audio encoder",
       "Codec/Encoder/Audio",
       "Adaptive Multi-Rate Wideband audio encoder",
       "Renato Araujo <renato.filho@indt.org.br>");
-}
-
-static void
-gst_voamrwbenc_class_init (GstVoAmrWbEncClass * klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GstAudioEncoderClass *base_class = GST_AUDIO_ENCODER_CLASS (klass);
-
-  object_class->set_property = gst_voamrwbenc_set_property;
-  object_class->get_property = gst_voamrwbenc_get_property;
 
   base_class->start = GST_DEBUG_FUNCPTR (gst_voamrwbenc_start);
   base_class->stop = GST_DEBUG_FUNCPTR (gst_voamrwbenc_stop);
@@ -195,7 +188,7 @@ gst_voamrwbenc_class_init (GstVoAmrWbEncClass * klass)
 }
 
 static void
-gst_voamrwbenc_init (GstVoAmrWbEnc * amrwbenc, GstVoAmrWbEncClass * klass)
+gst_voamrwbenc_init (GstVoAmrWbEnc * amrwbenc)
 {
   /* init rest */
   amrwbenc->handle = NULL;
@@ -259,7 +252,7 @@ gst_voamrwbenc_set_format (GstAudioEncoder * benc, GstAudioInfo * info)
       "channels", G_TYPE_INT, amrwbenc->channels,
       "rate", G_TYPE_INT, amrwbenc->rate, NULL);
 
-  gst_pad_set_caps (GST_AUDIO_ENCODER_SRC_PAD (amrwbenc), copy);
+  gst_audio_encoder_set_output_format (GST_AUDIO_ENCODER (amrwbenc), copy);
   gst_caps_unref (copy);
 
   /* report needs to base class: one frame at a time */
@@ -278,6 +271,7 @@ gst_voamrwbenc_handle_frame (GstAudioEncoder * benc, GstBuffer * buffer)
   const int buffer_size = sizeof (short) * L_FRAME16k;
   GstBuffer *out;
   gint outsize;
+  GstMapInfo map, omap;
 
   amrwbenc = GST_VOAMRWBENC (benc);
 
@@ -289,21 +283,25 @@ gst_voamrwbenc_handle_frame (GstAudioEncoder * benc, GstBuffer * buffer)
     goto done;
   }
 
-  if (G_UNLIKELY (GST_BUFFER_SIZE (buffer) < buffer_size)) {
-    GST_DEBUG_OBJECT (amrwbenc, "discarding trailing data %d",
-        buffer ? GST_BUFFER_SIZE (buffer) : 0);
+  gst_buffer_map (buffer, &map, GST_MAP_READ);
+
+  if (G_UNLIKELY (map.size < buffer_size)) {
+    GST_DEBUG_OBJECT (amrwbenc, "discarding trailing data %d", (gint) map.size);
+    gst_buffer_unmap (buffer, &map);
     ret = gst_audio_encoder_finish_frame (benc, NULL, -1);
     goto done;
   }
 
   out = gst_buffer_new_and_alloc (buffer_size);
+  gst_buffer_map (out, &omap, GST_MAP_WRITE);
   /* encode */
   outsize = E_IF_encode (amrwbenc->handle, amrwbenc->bandmode,
-      (const short *) GST_BUFFER_DATA (buffer),
-      (unsigned char *) GST_BUFFER_DATA (out), 0);
+      (const short *) map.data, (unsigned char *) omap.data, 0);
 
   GST_LOG_OBJECT (amrwbenc, "encoded to %d bytes", outsize);
-  GST_BUFFER_SIZE (out) = outsize;
+  gst_buffer_unmap (out, &omap);
+  gst_buffer_unmap (buffer, &map);
+  gst_buffer_resize (out, 0, outsize);
 
   ret = gst_audio_encoder_finish_frame (benc, out, L_FRAME16k);