flacdec: improve upstream peer duration querying
[platform/upstream/gst-plugins-good.git] / ext / flac / gstflacenc.c
index 4f290c4..6206529 100644 (file)
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+/**
+ * SECTION:element-flacenc
+ * @see_also: #GstFlacDec
+ *
+ * flacenc encodes FLAC streams.
+ * <ulink url="http://flac.sourceforge.net/">FLAC</ulink>
+ * is a Free Lossless Audio Codec.
+ *
+ * <refsect2>
+ * <title>Example launch line</title>
+ * |[
+ * gst-launch audiotestsrc num-buffers=100 ! flacenc ! filesink location=beep.flac
+ * ]|
+ * </refsect2>
+ */
 
-/* FIXME:
- *  - we assume timestamps start from 0 and that we get a perfect stream; we
- *    don't handle non-zero starts and mid-stream discontinuities, esp. not if
- *    we're muxing into ogg
+/* TODO: - We currently don't handle discontinuities in the stream in a useful
+ *         way and instead rely on the developer plugging in audiorate if
+ *         the stream contains discontinuities.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -127,7 +141,9 @@ enum
   PROP_EXHAUSTIVE_MODEL_SEARCH,
   PROP_MIN_RESIDUAL_PARTITION_ORDER,
   PROP_MAX_RESIDUAL_PARTITION_ORDER,
-  PROP_RICE_PARAMETER_SEARCH_DIST
+  PROP_RICE_PARAMETER_SEARCH_DIST,
+  PROP_PADDING,
+  PROP_SEEKPOINTS
 };
 
 GST_DEBUG_CATEGORY_STATIC (flacenc_debug);
@@ -145,15 +161,20 @@ GST_DEBUG_CATEGORY_STATIC (flacenc_debug);
                                  &tag_setter_info);                             \
   }G_STMT_END
 
-GST_BOILERPLATE_FULL (GstFlacEnc, gst_flac_enc, GstElement, GST_TYPE_ELEMENT,
-    _do_init);
+GST_BOILERPLATE_FULL (GstFlacEnc, gst_flac_enc, GstAudioEncoder,
+    GST_TYPE_AUDIO_ENCODER, _do_init);
 
-static void gst_flac_enc_finalize (GObject * object);
+static gboolean gst_flac_enc_start (GstAudioEncoder * enc);
+static gboolean gst_flac_enc_stop (GstAudioEncoder * enc);
+static gboolean gst_flac_enc_set_format (GstAudioEncoder * enc,
+    GstAudioInfo * info);
+static GstFlowReturn gst_flac_enc_handle_frame (GstAudioEncoder * enc,
+    GstBuffer * in_buf);
+static GstCaps *gst_flac_enc_getcaps (GstAudioEncoder * enc);
+static gboolean gst_flac_enc_sink_event (GstAudioEncoder * enc,
+    GstEvent * event);
 
-static gboolean gst_flac_enc_sink_setcaps (GstPad * pad, GstCaps * caps);
-static GstCaps *gst_flac_enc_sink_getcaps (GstPad * pad);
-static gboolean gst_flac_enc_sink_event (GstPad * pad, GstEvent * event);
-static GstFlowReturn gst_flac_enc_chain (GstPad * pad, GstBuffer * buffer);
+static void gst_flac_enc_finalize (GObject * object);
 
 static gboolean gst_flac_enc_update_quality (GstFlacEnc * flacenc,
     gint quality);
@@ -161,21 +182,7 @@ static void gst_flac_enc_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
 static void gst_flac_enc_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
-static GstStateChangeReturn gst_flac_enc_change_state (GstElement * element,
-    GstStateChange transition);
 
-#ifdef LEGACY_FLAC
-static FLAC__StreamEncoderWriteStatus
-gst_flac_enc_write_callback (const FLAC__SeekableStreamEncoder * encoder,
-    const FLAC__byte buffer[], unsigned bytes,
-    unsigned samples, unsigned current_frame, void *client_data);
-static FLAC__SeekableStreamEncoderSeekStatus
-gst_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder * encoder,
-    FLAC__uint64 absolute_byte_offset, void *client_data);
-static FLAC__SeekableStreamEncoderTellStatus
-gst_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder * encoder,
-    FLAC__uint64 * absolute_byte_offset, void *client_data);
-#else
 static FLAC__StreamEncoderWriteStatus
 gst_flac_enc_write_callback (const FLAC__StreamEncoder * encoder,
     const FLAC__byte buffer[], size_t bytes,
@@ -186,7 +193,6 @@ gst_flac_enc_seek_callback (const FLAC__StreamEncoder * encoder,
 static FLAC__StreamEncoderTellStatus
 gst_flac_enc_tell_callback (const FLAC__StreamEncoder * encoder,
     FLAC__uint64 * absolute_byte_offset, void *client_data);
-#endif
 
 typedef struct
 {
@@ -218,9 +224,11 @@ static const GstFlacEncParams flacenc_params[] = {
 };
 
 #define DEFAULT_QUALITY 5
+#define DEFAULT_PADDING 0
+#define DEFAULT_SEEKPOINTS 0
 
 #define GST_TYPE_FLAC_ENC_QUALITY (gst_flac_enc_quality_get_type ())
-GType
+static GType
 gst_flac_enc_quality_get_type (void)
 {
   static GType qtype = 0;
@@ -250,10 +258,8 @@ gst_flac_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 (&src_factory));
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&sink_factory));
+  gst_element_class_add_static_pad_template (element_class, &src_factory);
+  gst_element_class_add_static_pad_template (element_class, &sink_factory);
 
   gst_element_class_set_details_simple (element_class, "FLAC audio encoder",
       "Codec/Encoder/Audio",
@@ -268,124 +274,147 @@ static void
 gst_flac_enc_class_init (GstFlacEncClass * klass)
 {
   GObjectClass *gobject_class;
-  GstElementClass *gstelement_class;
+  GstAudioEncoderClass *base_class;
 
   gobject_class = (GObjectClass *) klass;
-  gstelement_class = (GstElementClass *) klass;
+  base_class = (GstAudioEncoderClass *) (klass);
 
   gobject_class->set_property = gst_flac_enc_set_property;
   gobject_class->get_property = gst_flac_enc_get_property;
   gobject_class->finalize = gst_flac_enc_finalize;
 
+  base_class->start = GST_DEBUG_FUNCPTR (gst_flac_enc_start);
+  base_class->stop = GST_DEBUG_FUNCPTR (gst_flac_enc_stop);
+  base_class->set_format = GST_DEBUG_FUNCPTR (gst_flac_enc_set_format);
+  base_class->handle_frame = GST_DEBUG_FUNCPTR (gst_flac_enc_handle_frame);
+  base_class->getcaps = GST_DEBUG_FUNCPTR (gst_flac_enc_getcaps);
+  base_class->event = GST_DEBUG_FUNCPTR (gst_flac_enc_sink_event);
+
   g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_QUALITY,
       g_param_spec_enum ("quality",
           "Quality",
           "Speed versus compression tradeoff",
-          GST_TYPE_FLAC_ENC_QUALITY, DEFAULT_QUALITY, G_PARAM_READWRITE));
+          GST_TYPE_FLAC_ENC_QUALITY, DEFAULT_QUALITY,
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (G_OBJECT_CLASS (klass),
-      PROP_STREAMABLE_SUBSET, g_param_spec_boolean ("streamable_subset",
+      PROP_STREAMABLE_SUBSET, g_param_spec_boolean ("streamable-subset",
           "Streamable subset",
           "true to limit encoder to generating a Subset stream, else false",
-          TRUE, G_PARAM_READWRITE));
+          TRUE,
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_MID_SIDE_STEREO,
-      g_param_spec_boolean ("mid_side_stereo", "Do mid side stereo",
+      g_param_spec_boolean ("mid-side-stereo", "Do mid side stereo",
           "Do mid side stereo (only for stereo input)",
-          flacenc_params[DEFAULT_QUALITY].mid_side, G_PARAM_READWRITE));
+          flacenc_params[DEFAULT_QUALITY].mid_side,
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (G_OBJECT_CLASS (klass),
-      PROP_LOOSE_MID_SIDE_STEREO, g_param_spec_boolean ("loose_mid_side_stereo",
+      PROP_LOOSE_MID_SIDE_STEREO, g_param_spec_boolean ("loose-mid-side-stereo",
           "Loose mid side stereo", "Loose mid side stereo",
-          flacenc_params[DEFAULT_QUALITY].loose_mid_side, G_PARAM_READWRITE));
+          flacenc_params[DEFAULT_QUALITY].loose_mid_side,
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_BLOCKSIZE,
       g_param_spec_uint ("blocksize", "Blocksize", "Blocksize in samples",
           FLAC__MIN_BLOCK_SIZE, FLAC__MAX_BLOCK_SIZE,
-          flacenc_params[DEFAULT_QUALITY].blocksize, G_PARAM_READWRITE));
+          flacenc_params[DEFAULT_QUALITY].blocksize,
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_MAX_LPC_ORDER,
-      g_param_spec_uint ("max_lpc_order", "Max LPC order",
+      g_param_spec_uint ("max-lpc-order", "Max LPC order",
           "Max LPC order; 0 => use only fixed predictors", 0,
           FLAC__MAX_LPC_ORDER, flacenc_params[DEFAULT_QUALITY].max_lpc_order,
-          G_PARAM_READWRITE));
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (G_OBJECT_CLASS (klass),
-      PROP_QLP_COEFF_PRECISION, g_param_spec_uint ("qlp_coeff_precision",
+      PROP_QLP_COEFF_PRECISION, g_param_spec_uint ("qlp-coeff-precision",
           "QLP coefficients precision",
           "Precision in bits of quantized linear-predictor coefficients; 0 = automatic",
           0, 32, flacenc_params[DEFAULT_QUALITY].qlp_coeff_precision,
-          G_PARAM_READWRITE));
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (G_OBJECT_CLASS (klass),
-      PROP_QLP_COEFF_PREC_SEARCH, g_param_spec_boolean ("qlp_coeff_prec_search",
+      PROP_QLP_COEFF_PREC_SEARCH, g_param_spec_boolean ("qlp-coeff-prec-search",
           "Do QLP coefficients precision search",
           "false = use qlp_coeff_precision, "
           "true = search around qlp_coeff_precision, take best",
           flacenc_params[DEFAULT_QUALITY].qlp_coeff_prec_search,
-          G_PARAM_READWRITE));
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_ESCAPE_CODING,
-      g_param_spec_boolean ("escape_coding", "Do Escape coding",
+      g_param_spec_boolean ("escape-coding", "Do Escape coding",
           "search for escape codes in the entropy coding stage "
           "for slightly better compression",
-          flacenc_params[DEFAULT_QUALITY].escape_coding, G_PARAM_READWRITE));
+          flacenc_params[DEFAULT_QUALITY].escape_coding,
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (G_OBJECT_CLASS (klass),
       PROP_EXHAUSTIVE_MODEL_SEARCH,
-      g_param_spec_boolean ("exhaustive_model_search",
+      g_param_spec_boolean ("exhaustive-model-search",
           "Do exhaustive model search",
           "do exhaustive search of LP coefficient quantization (expensive!)",
           flacenc_params[DEFAULT_QUALITY].exhaustive_model_search,
-          G_PARAM_READWRITE));
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (G_OBJECT_CLASS (klass),
       PROP_MIN_RESIDUAL_PARTITION_ORDER,
-      g_param_spec_uint ("min_residual_partition_order",
+      g_param_spec_uint ("min-residual-partition-order",
           "Min residual partition order",
           "Min residual partition order (above 4 doesn't usually help much)", 0,
           16, flacenc_params[DEFAULT_QUALITY].min_residual_partition_order,
-          G_PARAM_READWRITE));
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (G_OBJECT_CLASS (klass),
       PROP_MAX_RESIDUAL_PARTITION_ORDER,
-      g_param_spec_uint ("max_residual_partition_order",
+      g_param_spec_uint ("max-residual-partition-order",
           "Max residual partition order",
           "Max residual partition order (above 4 doesn't usually help much)", 0,
           16, flacenc_params[DEFAULT_QUALITY].max_residual_partition_order,
-          G_PARAM_READWRITE));
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (G_OBJECT_CLASS (klass),
       PROP_RICE_PARAMETER_SEARCH_DIST,
-      g_param_spec_uint ("rice_parameter_search_dist",
+      g_param_spec_uint ("rice-parameter-search-dist",
           "rice_parameter_search_dist",
           "0 = try only calc'd parameter k; else try all [k-dist..k+dist] "
           "parameters, use best", 0, FLAC__MAX_RICE_PARTITION_ORDER,
           flacenc_params[DEFAULT_QUALITY].rice_parameter_search_dist,
-          G_PARAM_READWRITE));
-
-  gstelement_class->change_state = gst_flac_enc_change_state;
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstFlacEnc:padding
+   *
+   * Write a PADDING block with this length in bytes
+   *
+   * Since: 0.10.16
+   **/
+  g_object_class_install_property (G_OBJECT_CLASS (klass),
+      PROP_PADDING,
+      g_param_spec_uint ("padding",
+          "Padding",
+          "Write a PADDING block with this length in bytes", 0, G_MAXUINT,
+          DEFAULT_PADDING,
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstFlacEnc:seekpoints
+   *
+   * Write a SEEKTABLE block with a specific number of seekpoints
+   * or with a specific interval spacing.
+   *
+   * Since: 0.10.18
+   **/
+  g_object_class_install_property (G_OBJECT_CLASS (klass),
+      PROP_SEEKPOINTS,
+      g_param_spec_int ("seekpoints",
+          "Seekpoints",
+          "Add SEEKTABLE metadata (if > 0, number of entries, if < 0, interval in sec)",
+          -G_MAXINT, G_MAXINT,
+          DEFAULT_SEEKPOINTS,
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
 }
 
 static void
 gst_flac_enc_init (GstFlacEnc * flacenc, GstFlacEncClass * klass)
 {
-  flacenc->sinkpad = gst_pad_new_from_static_template (&sink_factory, "sink");
-  gst_pad_set_chain_function (flacenc->sinkpad,
-      GST_DEBUG_FUNCPTR (gst_flac_enc_chain));
-  gst_pad_set_event_function (flacenc->sinkpad,
-      GST_DEBUG_FUNCPTR (gst_flac_enc_sink_event));
-  gst_pad_set_getcaps_function (flacenc->sinkpad,
-      GST_DEBUG_FUNCPTR (gst_flac_enc_sink_getcaps));
-  gst_pad_set_setcaps_function (flacenc->sinkpad,
-      GST_DEBUG_FUNCPTR (gst_flac_enc_sink_setcaps));
-  gst_element_add_pad (GST_ELEMENT (flacenc), flacenc->sinkpad);
-
-  flacenc->srcpad = gst_pad_new_from_static_template (&src_factory, "src");
-  gst_pad_use_fixed_caps (flacenc->srcpad);
-  gst_element_add_pad (GST_ELEMENT (flacenc), flacenc->srcpad);
-
-#ifdef LEGACY_FLAC
-  flacenc->encoder = FLAC__seekable_stream_encoder_new ();
-#else
-  flacenc->encoder = FLAC__stream_encoder_new ();
-#endif
+  GstAudioEncoder *enc = GST_AUDIO_ENCODER (flacenc);
 
-  flacenc->offset = 0;
-  flacenc->samples_written = 0;
+  flacenc->encoder = FLAC__stream_encoder_new ();
   gst_flac_enc_update_quality (flacenc, DEFAULT_QUALITY);
-  flacenc->tags = gst_tag_list_new ();
-  flacenc->got_headers = FALSE;
-  flacenc->headers = NULL;
-  flacenc->last_flow = GST_FLOW_OK;
+
+  /* arrange granulepos marking (and required perfect ts) */
+  gst_audio_encoder_set_mark_granule (enc, TRUE);
+  gst_audio_encoder_set_perfect_timestamp (enc, TRUE);
 }
 
 static void
@@ -393,16 +422,64 @@ gst_flac_enc_finalize (GObject * object)
 {
   GstFlacEnc *flacenc = GST_FLAC_ENC (object);
 
-  gst_tag_list_free (flacenc->tags);
-#ifdef LEGACY_FLAC
-  FLAC__seekable_stream_encoder_delete (flacenc->encoder);
-#else
   FLAC__stream_encoder_delete (flacenc->encoder);
-#endif
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
+static gboolean
+gst_flac_enc_start (GstAudioEncoder * enc)
+{
+  GstFlacEnc *flacenc = GST_FLAC_ENC (enc);
+
+  GST_DEBUG_OBJECT (enc, "start");
+  flacenc->stopped = TRUE;
+  flacenc->got_headers = FALSE;
+  flacenc->last_flow = GST_FLOW_OK;
+  flacenc->offset = 0;
+  flacenc->channels = 0;
+  flacenc->depth = 0;
+  flacenc->sample_rate = 0;
+  flacenc->eos = FALSE;
+  flacenc->tags = gst_tag_list_new ();
+
+  return TRUE;
+}
+
+static gboolean
+gst_flac_enc_stop (GstAudioEncoder * enc)
+{
+  GstFlacEnc *flacenc = GST_FLAC_ENC (enc);
+
+  GST_DEBUG_OBJECT (enc, "stop");
+  gst_tag_list_free (flacenc->tags);
+  flacenc->tags = NULL;
+  if (FLAC__stream_encoder_get_state (flacenc->encoder) !=
+      FLAC__STREAM_ENCODER_UNINITIALIZED) {
+    flacenc->stopped = TRUE;
+    FLAC__stream_encoder_finish (flacenc->encoder);
+  }
+  if (flacenc->meta) {
+    FLAC__metadata_object_delete (flacenc->meta[0]);
+
+    if (flacenc->meta[1])
+      FLAC__metadata_object_delete (flacenc->meta[1]);
+
+    if (flacenc->meta[2])
+      FLAC__metadata_object_delete (flacenc->meta[2]);
+
+    g_free (flacenc->meta);
+    flacenc->meta = NULL;
+  }
+  g_list_foreach (flacenc->headers, (GFunc) gst_mini_object_unref, NULL);
+  g_list_free (flacenc->headers);
+  flacenc->headers = NULL;
+
+  gst_tag_setter_reset_tags (GST_TAG_SETTER (enc));
+
+  return TRUE;
+}
+
 static void
 add_one_tag (const GstTagList * list, const gchar * tag, gpointer user_data)
 {
@@ -410,6 +487,13 @@ add_one_tag (const GstTagList * list, const gchar * tag, gpointer user_data)
   GList *it;
   GstFlacEnc *flacenc = GST_FLAC_ENC (user_data);
 
+  /* IMAGE and PREVIEW_IMAGE tags are already written
+   * differently, no need to store them inside the
+   * vorbiscomments too */
+  if (strcmp (tag, GST_TAG_IMAGE) == 0
+      || strcmp (tag, GST_TAG_PREVIEW_IMAGE) == 0)
+    return;
+
   comments = gst_tag_to_vorbis_comments (list, tag);
   for (it = comments; it != NULL; it = it->next) {
     FLAC__StreamMetadata_VorbisComment_Entry commment_entry;
@@ -425,10 +509,12 @@ add_one_tag (const GstTagList * list, const gchar * tag, gpointer user_data)
 }
 
 static void
-gst_flac_enc_set_metadata (GstFlacEnc * flacenc)
+gst_flac_enc_set_metadata (GstFlacEnc * flacenc, guint64 total_samples)
 {
   const GstTagList *user_tags;
   GstTagList *copy;
+  gint entries = 1;
+  gint n_images, n_preview_images;
 
   g_return_if_fail (flacenc != NULL);
   user_tags = gst_tag_setter_get_tag_list (GST_TAG_SETTER (flacenc));
@@ -437,20 +523,99 @@ gst_flac_enc_set_metadata (GstFlacEnc * flacenc)
   }
   copy = gst_tag_list_merge (user_tags, flacenc->tags,
       gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (flacenc)));
-  flacenc->meta = g_malloc (sizeof (FLAC__StreamMetadata **));
+  n_images = gst_tag_list_get_tag_size (copy, GST_TAG_IMAGE);
+  n_preview_images = gst_tag_list_get_tag_size (copy, GST_TAG_PREVIEW_IMAGE);
+
+  flacenc->meta =
+      g_new0 (FLAC__StreamMetadata *, 3 + n_images + n_preview_images);
 
   flacenc->meta[0] =
       FLAC__metadata_object_new (FLAC__METADATA_TYPE_VORBIS_COMMENT);
   gst_tag_list_foreach (copy, add_one_tag, flacenc);
 
-#ifdef LEGACY_FLAC
-  if (FLAC__seekable_stream_encoder_set_metadata (flacenc->encoder,
-          flacenc->meta, 1) != true)
-#else
+  if (n_images + n_preview_images > 0) {
+    GstBuffer *buffer;
+    GstCaps *caps;
+    GstStructure *structure;
+    GstTagImageType image_type = GST_TAG_IMAGE_TYPE_NONE;
+    gint i;
+
+    for (i = 0; i < n_images + n_preview_images; i++) {
+      if (i < n_images) {
+        if (!gst_tag_list_get_buffer_index (copy, GST_TAG_IMAGE, i, &buffer))
+          continue;
+      } else {
+        if (!gst_tag_list_get_buffer_index (copy, GST_TAG_PREVIEW_IMAGE,
+                i - n_images, &buffer))
+          continue;
+      }
+
+      flacenc->meta[entries] =
+          FLAC__metadata_object_new (FLAC__METADATA_TYPE_PICTURE);
+
+      caps = gst_buffer_get_caps (buffer);
+      structure = gst_caps_get_structure (caps, 0);
+
+      gst_structure_get (structure, "image-type", GST_TYPE_TAG_IMAGE_TYPE,
+          &image_type, NULL);
+      /* Convert to ID3v2 APIC image type */
+      if (image_type == GST_TAG_IMAGE_TYPE_NONE)
+        image_type = (i < n_images) ? 0x00 : 0x01;
+      else
+        image_type = image_type + 2;
+
+      FLAC__metadata_object_picture_set_data (flacenc->meta[entries],
+          GST_BUFFER_DATA (buffer), GST_BUFFER_SIZE (buffer), TRUE);
+      /* FIXME: There's no way to set the picture type in libFLAC */
+      flacenc->meta[entries]->data.picture.type = image_type;
+      FLAC__metadata_object_picture_set_mime_type (flacenc->meta[entries],
+          (char *) gst_structure_get_name (structure), TRUE);
+
+      gst_caps_unref (caps);
+      gst_buffer_unref (buffer);
+      entries++;
+    }
+  }
+
+  if (flacenc->seekpoints && total_samples != GST_CLOCK_TIME_NONE) {
+    gboolean res;
+    guint samples;
+
+    flacenc->meta[entries] =
+        FLAC__metadata_object_new (FLAC__METADATA_TYPE_SEEKTABLE);
+    if (flacenc->seekpoints > 0) {
+      res =
+          FLAC__metadata_object_seektable_template_append_spaced_points
+          (flacenc->meta[entries], flacenc->seekpoints, total_samples);
+    } else {
+      samples = -flacenc->seekpoints * flacenc->sample_rate;
+      res =
+          FLAC__metadata_object_seektable_template_append_spaced_points_by_samples
+          (flacenc->meta[entries], samples, total_samples);
+    }
+    if (!res) {
+      GST_DEBUG_OBJECT (flacenc, "adding seekpoint template %d failed",
+          flacenc->seekpoints);
+      FLAC__metadata_object_delete (flacenc->meta[1]);
+      flacenc->meta[entries] = NULL;
+    } else {
+      entries++;
+    }
+  } else if (flacenc->seekpoints && total_samples == GST_CLOCK_TIME_NONE) {
+    GST_WARNING_OBJECT (flacenc, "total time unknown; can not add seekpoints");
+  }
+
+  if (flacenc->padding > 0) {
+    flacenc->meta[entries] =
+        FLAC__metadata_object_new (FLAC__METADATA_TYPE_PADDING);
+    flacenc->meta[entries]->length = flacenc->padding;
+    entries++;
+  }
+
   if (FLAC__stream_encoder_set_metadata (flacenc->encoder,
-          flacenc->meta, 1) != true)
-#endif
+          flacenc->meta, entries) != true)
     g_warning ("Dude, i'm already initialized!");
+
   gst_tag_list_free (copy);
 }
 
@@ -498,9 +663,12 @@ gst_flac_enc_caps_append_structure_with_widths (GstCaps * caps,
 }
 
 static GstCaps *
-gst_flac_enc_sink_getcaps (GstPad * pad)
+gst_flac_enc_getcaps (GstAudioEncoder * enc)
 {
-  GstCaps *ret = NULL;
+  GstCaps *ret = NULL, *caps = NULL;
+  GstPad *pad;
+
+  pad = GST_AUDIO_ENCODER_SINK_PAD (enc);
 
   GST_OBJECT_LOCK (pad);
 
@@ -548,7 +716,10 @@ gst_flac_enc_sink_getcaps (GstPad * pad)
 
   GST_DEBUG_OBJECT (pad, "Return caps %" GST_PTR_FORMAT, ret);
 
-  return ret;
+  caps = gst_audio_encoder_proxy_getcaps (enc, ret);
+  gst_caps_unref (ret);
+
+  return caps;
 }
 
 static guint64
@@ -557,15 +728,19 @@ gst_flac_enc_query_peer_total_samples (GstFlacEnc * flacenc, GstPad * pad)
   GstFormat fmt = GST_FORMAT_DEFAULT;
   gint64 duration;
 
+  GST_DEBUG_OBJECT (flacenc, "querying peer for DEFAULT format duration");
   if (gst_pad_query_peer_duration (pad, &fmt, &duration)
       && fmt == GST_FORMAT_DEFAULT && duration != GST_CLOCK_TIME_NONE)
     goto done;
 
   fmt = GST_FORMAT_TIME;
+  GST_DEBUG_OBJECT (flacenc, "querying peer for TIME format duration");
 
   if (gst_pad_query_peer_duration (pad, &fmt, &duration) &&
       fmt == GST_FORMAT_TIME && duration != GST_CLOCK_TIME_NONE) {
-    duration = GST_FRAMES_TO_CLOCK_TIME (duration, flacenc->sample_rate);
+    GST_DEBUG_OBJECT (flacenc, "peer reported duration %" GST_TIME_FORMAT,
+        GST_TIME_ARGS (duration));
+    duration = GST_CLOCK_TIME_TO_FRAMES (duration, flacenc->sample_rate);
 
     goto done;
   }
@@ -581,102 +756,58 @@ done:
 }
 
 static gboolean
-gst_flac_enc_sink_setcaps (GstPad * pad, GstCaps * caps)
+gst_flac_enc_set_format (GstAudioEncoder * enc, GstAudioInfo * info)
 {
   GstFlacEnc *flacenc;
-  GstStructure *structure;
   guint64 total_samples = GST_CLOCK_TIME_NONE;
-
-#ifdef LEGACY_FLAC
-  FLAC__SeekableStreamEncoderState state;
-#else
   FLAC__StreamEncoderInitStatus init_status;
-#endif
-  gint depth, chans, rate, width;
+  GstCaps *caps;
 
-  flacenc = GST_FLAC_ENC (gst_pad_get_parent (pad));
+  flacenc = GST_FLAC_ENC (enc);
 
-#ifdef LEGACY_FLAC
-  if (FLAC__seekable_stream_encoder_get_state (flacenc->encoder) !=
-      FLAC__SEEKABLE_STREAM_ENCODER_UNINITIALIZED)
-#else
+  /* if configured again, means something changed, can't handle that */
   if (FLAC__stream_encoder_get_state (flacenc->encoder) !=
       FLAC__STREAM_ENCODER_UNINITIALIZED)
-#endif
-
     goto encoder_already_initialized;
 
-  structure = gst_caps_get_structure (caps, 0);
-
-  if (!gst_structure_get_int (structure, "channels", &chans) ||
-      !gst_structure_get_int (structure, "width", &width) ||
-      !gst_structure_get_int (structure, "depth", &depth) ||
-      !gst_structure_get_int (structure, "rate", &rate)) {
-    GST_DEBUG_OBJECT (flacenc, "incomplete caps: %" GST_PTR_FORMAT, caps);
-    return FALSE;
-  }
-
-  flacenc->channels = chans;
-  flacenc->width = width;
-  flacenc->depth = depth;
-  flacenc->sample_rate = rate;
+  flacenc->channels = GST_AUDIO_INFO_CHANNELS (info);
+  flacenc->width = GST_AUDIO_INFO_WIDTH (info);
+  flacenc->depth = GST_AUDIO_INFO_DEPTH (info);
+  flacenc->sample_rate = GST_AUDIO_INFO_RATE (info);
 
   caps = gst_caps_new_simple ("audio/x-flac",
       "channels", G_TYPE_INT, flacenc->channels,
       "rate", G_TYPE_INT, flacenc->sample_rate, NULL);
 
-  if (!gst_pad_set_caps (flacenc->srcpad, caps))
+  if (!gst_pad_set_caps (GST_AUDIO_ENCODER_SRC_PAD (enc), caps))
     goto setting_src_caps_failed;
 
   gst_caps_unref (caps);
 
-  total_samples = gst_flac_enc_query_peer_total_samples (flacenc, pad);
-
-#ifdef LEGACY_FLAC
-  FLAC__seekable_stream_encoder_set_bits_per_sample (flacenc->encoder,
-      flacenc->depth);
-  FLAC__seekable_stream_encoder_set_sample_rate (flacenc->encoder,
-      flacenc->sample_rate);
-  FLAC__seekable_stream_encoder_set_channels (flacenc->encoder,
-      flacenc->channels);
+  total_samples = gst_flac_enc_query_peer_total_samples (flacenc,
+      GST_AUDIO_ENCODER_SINK_PAD (enc));
 
-  if (total_samples != GST_CLOCK_TIME_NONE)
-    FLAC__seekable_stream_encoder_set_total_samples_estimate (flacenc->encoder,
-        total_samples);
-
-  FLAC__seekable_stream_encoder_set_write_callback (flacenc->encoder,
-      gst_flac_enc_write_callback);
-  FLAC__seekable_stream_encoder_set_seek_callback (flacenc->encoder,
-      gst_flac_enc_seek_callback);
-  FLAC__seekable_stream_encoder_set_tell_callback (flacenc->encoder,
-      gst_flac_enc_tell_callback);
-
-  FLAC__seekable_stream_encoder_set_client_data (flacenc->encoder, flacenc);
-#else
   FLAC__stream_encoder_set_bits_per_sample (flacenc->encoder, flacenc->depth);
   FLAC__stream_encoder_set_sample_rate (flacenc->encoder, flacenc->sample_rate);
   FLAC__stream_encoder_set_channels (flacenc->encoder, flacenc->channels);
 
   if (total_samples != GST_CLOCK_TIME_NONE)
     FLAC__stream_encoder_set_total_samples_estimate (flacenc->encoder,
-        total_samples);
-#endif
+        MIN (total_samples, G_GUINT64_CONSTANT (0x0FFFFFFFFF)));
 
-  gst_flac_enc_set_metadata (flacenc);
+  gst_flac_enc_set_metadata (flacenc, total_samples);
+
+  /* callbacks clear to go now;
+   * write callbacks receives headers during init */
+  flacenc->stopped = FALSE;
 
-#ifdef LEGACY_FLAC
-  state = FLAC__seekable_stream_encoder_init (flacenc->encoder);
-  if (state != FLAC__STREAM_ENCODER_OK)
-    goto failed_to_initialize;
-#else
   init_status = FLAC__stream_encoder_init_stream (flacenc->encoder,
       gst_flac_enc_write_callback, gst_flac_enc_seek_callback,
       gst_flac_enc_tell_callback, NULL, flacenc);
   if (init_status != FLAC__STREAM_ENCODER_INIT_STATUS_OK)
     goto failed_to_initialize;
-#endif
 
-  gst_object_unref (flacenc);
+  /* no special feedback to base class; should provide all available samples */
 
   return TRUE;
 
@@ -708,18 +839,6 @@ gst_flac_enc_update_quality (GstFlacEnc * flacenc, gint quality)
 {
   flacenc->quality = quality;
 
-#ifdef LEGACY_FLAC
-#define DO_UPDATE(name, val, str)                                               \
-  G_STMT_START {                                                                \
-    if (FLAC__seekable_stream_encoder_get_##name (flacenc->encoder) !=          \
-        flacenc_params[quality].val) {                                          \
-      FLAC__seekable_stream_encoder_set_##name (flacenc->encoder,               \
-          flacenc_params[quality].val);                                         \
-      g_object_notify (G_OBJECT (flacenc), str);                                \
-    }                                                                           \
-  } G_STMT_END
-
-#else
 #define DO_UPDATE(name, val, str)                                               \
   G_STMT_START {                                                                \
     if (FLAC__stream_encoder_get_##name (flacenc->encoder) !=                   \
@@ -730,11 +849,9 @@ gst_flac_enc_update_quality (GstFlacEnc * flacenc, gint quality)
     }                                                                           \
   } G_STMT_END
 
-#endif
-
   g_object_freeze_notify (G_OBJECT (flacenc));
 
-  if (flacenc->channels == 2) {
+  if (flacenc->channels == 2 || flacenc->channels == 0) {
     DO_UPDATE (do_mid_side_stereo, mid_side, "mid_side_stereo");
     DO_UPDATE (loose_mid_side_stereo, loose_mid_side, "loose_mid_side");
   }
@@ -761,15 +878,9 @@ gst_flac_enc_update_quality (GstFlacEnc * flacenc, gint quality)
   return TRUE;
 }
 
-#ifdef LEGACY_FLAC
-static FLAC__SeekableStreamEncoderSeekStatus
-gst_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder * encoder,
-    FLAC__uint64 absolute_byte_offset, void *client_data)
-#else
 static FLAC__StreamEncoderSeekStatus
 gst_flac_enc_seek_callback (const FLAC__StreamEncoder * encoder,
     FLAC__uint64 absolute_byte_offset, void *client_data)
-#endif
 {
   GstFlacEnc *flacenc;
   GstEvent *event;
@@ -778,43 +889,31 @@ gst_flac_enc_seek_callback (const FLAC__StreamEncoder * encoder,
   flacenc = GST_FLAC_ENC (client_data);
 
   if (flacenc->stopped)
-#ifdef LEGACY_FLAC
-    return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK;
-#else
     return FLAC__STREAM_ENCODER_SEEK_STATUS_OK;
-#endif
+
   event = gst_event_new_new_segment (TRUE, 1.0, GST_FORMAT_BYTES,
       absolute_byte_offset, GST_BUFFER_OFFSET_NONE, 0);
 
-  if ((peerpad = gst_pad_get_peer (flacenc->srcpad))) {
+  if ((peerpad = gst_pad_get_peer (GST_AUDIO_ENCODER_SRC_PAD (flacenc)))) {
     gboolean ret = gst_pad_send_event (peerpad, event);
 
     gst_object_unref (peerpad);
 
     if (ret) {
-      GST_DEBUG ("Seek to %" G_GUINT64_FORMAT " %s", absolute_byte_offset,
-          "succeeded");
+      GST_DEBUG ("Seek to %" G_GUINT64_FORMAT " %s",
+          (guint64) absolute_byte_offset, "succeeded");
     } else {
-      GST_DEBUG ("Seek to %" G_GUINT64_FORMAT " %s", absolute_byte_offset,
-          "failed");
-#ifdef LEGACY_FLAC
-      return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED;
-#else
+      GST_DEBUG ("Seek to %" G_GUINT64_FORMAT " %s",
+          (guint64) absolute_byte_offset, "failed");
       return FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED;
-#endif
-
     }
   } else {
     GST_DEBUG ("Seek to %" G_GUINT64_FORMAT " failed (no peer pad)",
-        absolute_byte_offset);
+        (guint64) absolute_byte_offset);
   }
 
   flacenc->offset = absolute_byte_offset;
-#ifdef LEGACY_FLAC
-  return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK;
-#else
   return FLAC__STREAM_ENCODER_SEEK_STATUS_OK;
-#endif
 }
 
 static void
@@ -836,7 +935,7 @@ notgst_value_array_append_buffer (GValue * array_val, GstBuffer * buf)
 #define HDR_TYPE_STREAMINFO     0
 #define HDR_TYPE_VORBISCOMMENT  4
 
-static void
+static GstFlowReturn
 gst_flac_enc_process_stream_headers (GstFlacEnc * enc)
 {
   GstBuffer *vorbiscomment = NULL;
@@ -845,6 +944,7 @@ gst_flac_enc_process_stream_headers (GstFlacEnc * enc)
   GValue array = { 0, };
   GstCaps *caps;
   GList *l;
+  GstFlowReturn ret = GST_FLOW_OK;
 
   caps = gst_caps_new_simple ("audio/x-flac",
       "channels", G_TYPE_INT, enc->channels,
@@ -920,8 +1020,6 @@ gst_flac_enc_process_stream_headers (GstFlacEnc * enc)
 
 push_headers:
 
-  gst_pad_set_caps (enc->srcpad, caps);
-
   /* push header buffers; update caps, so when we push the first buffer the
    * negotiated caps will change to caps that include the streamheader field */
   for (l = enc->headers; l != NULL; l = l->next) {
@@ -929,27 +1027,25 @@ push_headers:
 
     buf = GST_BUFFER (l->data);
     gst_buffer_set_caps (buf, caps);
-    GST_LOG ("Pushing header buffer, size %u bytes", GST_BUFFER_SIZE (buf));
-    (void) gst_pad_push (enc->srcpad, buf);
+    GST_LOG_OBJECT (enc, "Pushing header buffer, size %u bytes",
+        GST_BUFFER_SIZE (buf));
+    GST_MEMDUMP_OBJECT (enc, "header buffer", GST_BUFFER_DATA (buf),
+        GST_BUFFER_SIZE (buf));
+    ret = gst_pad_push (GST_AUDIO_ENCODER_SRC_PAD (enc), buf);
     l->data = NULL;
   }
   g_list_free (enc->headers);
   enc->headers = NULL;
 
   gst_caps_unref (caps);
+
+  return ret;
 }
 
-#ifdef LEGACY_FLAC
-static FLAC__StreamEncoderWriteStatus
-gst_flac_enc_write_callback (const FLAC__SeekableStreamEncoder * encoder,
-    const FLAC__byte buffer[], unsigned bytes,
-    unsigned samples, unsigned current_frame, void *client_data)
-#else
 static FLAC__StreamEncoderWriteStatus
 gst_flac_enc_write_callback (const FLAC__StreamEncoder * encoder,
     const FLAC__byte buffer[], size_t bytes,
     unsigned samples, unsigned current_frame, void *client_data)
-#endif
 {
   GstFlowReturn ret = GST_FLOW_OK;
   GstFlacEnc *flacenc;
@@ -963,48 +1059,38 @@ gst_flac_enc_write_callback (const FLAC__StreamEncoder * encoder,
   outbuf = gst_buffer_new_and_alloc (bytes);
   memcpy (GST_BUFFER_DATA (outbuf), buffer, bytes);
 
-  if (samples > 0 && flacenc->samples_written != (guint64) - 1) {
-    guint64 granulepos;
-
-    GST_BUFFER_TIMESTAMP (outbuf) =
-        GST_FRAMES_TO_CLOCK_TIME (flacenc->samples_written,
-        flacenc->sample_rate);
-    GST_BUFFER_DURATION (outbuf) =
-        GST_FRAMES_TO_CLOCK_TIME (samples, flacenc->sample_rate);
-    /* offset_end = granulepos for ogg muxer */
-    granulepos = flacenc->samples_written + samples;
-    GST_BUFFER_OFFSET_END (outbuf) = granulepos;
-    /* offset = timestamp corresponding to granulepos for ogg muxer
-     * (see vorbisenc for a much more elaborate version of this) */
-    GST_BUFFER_OFFSET (outbuf) =
-        GST_FRAMES_TO_CLOCK_TIME (granulepos, flacenc->sample_rate);
-  } else {
-    GST_BUFFER_TIMESTAMP (outbuf) = GST_CLOCK_TIME_NONE;
-    GST_BUFFER_DURATION (outbuf) = GST_CLOCK_TIME_NONE;
-  }
-
   /* we assume libflac passes us stuff neatly framed */
   if (!flacenc->got_headers) {
     if (samples == 0) {
-      GST_DEBUG_OBJECT (flacenc, "Got header, queueing (%u bytes)", bytes);
+      GST_DEBUG_OBJECT (flacenc, "Got header, queueing (%u bytes)",
+          (guint) bytes);
       flacenc->headers = g_list_append (flacenc->headers, outbuf);
       /* note: it's important that we increase our byte offset */
       goto out;
     } else {
       GST_INFO_OBJECT (flacenc, "Non-header packet, we have all headers now");
-      gst_flac_enc_process_stream_headers (flacenc);
+      ret = gst_flac_enc_process_stream_headers (flacenc);
       flacenc->got_headers = TRUE;
     }
-  } else if (flacenc->got_headers && samples == 0) {
-    GST_WARNING_OBJECT (flacenc, "Got header packet after data packets");
   }
 
-  GST_LOG ("Pushing buffer: ts=%" GST_TIME_FORMAT ", samples=%u, size=%u, "
-      "pos=%" G_GUINT64_FORMAT, GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)),
-      samples, bytes, flacenc->offset);
-
-  gst_buffer_set_caps (outbuf, GST_PAD_CAPS (flacenc->srcpad));
-  ret = gst_pad_push (flacenc->srcpad, outbuf);
+  if (flacenc->got_headers && samples == 0) {
+    /* header fixup, push downstream directly */
+    GST_DEBUG_OBJECT (flacenc, "Fixing up headers at pos=%" G_GUINT64_FORMAT
+        ", size=%u", flacenc->offset, (guint) bytes);
+    GST_MEMDUMP_OBJECT (flacenc, "Presumed header fragment",
+        GST_BUFFER_DATA (outbuf), GST_BUFFER_SIZE (outbuf));
+    gst_buffer_set_caps (outbuf,
+        GST_PAD_CAPS (GST_AUDIO_ENCODER_SRC_PAD (flacenc)));
+    ret = gst_pad_push (GST_AUDIO_ENCODER_SRC_PAD (flacenc), outbuf);
+  } else {
+    /* regular frame data, pass to base class */
+    GST_LOG ("Pushing buffer: ts=%" GST_TIME_FORMAT ", samples=%u, size=%u, "
+        "pos=%" G_GUINT64_FORMAT, GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)),
+        samples, (guint) bytes, flacenc->offset);
+    ret = gst_audio_encoder_finish_frame (GST_AUDIO_ENCODER (flacenc),
+        outbuf, samples);
+  }
 
   if (ret != GST_FLOW_OK)
     GST_DEBUG_OBJECT (flacenc, "flow: %s", gst_flow_get_name (ret));
@@ -1012,45 +1098,33 @@ gst_flac_enc_write_callback (const FLAC__StreamEncoder * encoder,
   flacenc->last_flow = ret;
 
 out:
-
   flacenc->offset += bytes;
-  flacenc->samples_written += samples;
 
-  if (GST_FLOW_IS_FATAL (ret) || ret == GST_FLOW_NOT_LINKED)
+  if (ret != GST_FLOW_OK)
     return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR;
 
   return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
 }
 
-#ifdef LEGACY_FLAC
-static FLAC__SeekableStreamEncoderTellStatus
-gst_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder * encoder,
-    FLAC__uint64 * absolute_byte_offset, void *client_data)
-#else
 static FLAC__StreamEncoderTellStatus
 gst_flac_enc_tell_callback (const FLAC__StreamEncoder * encoder,
     FLAC__uint64 * absolute_byte_offset, void *client_data)
-#endif
 {
   GstFlacEnc *flacenc = GST_FLAC_ENC (client_data);
 
   *absolute_byte_offset = flacenc->offset;
 
-#ifdef LEGACY_FLAC
-  return FLAC__SEEKABLE_STREAM_ENCODER_TELL_STATUS_OK;
-#else
   return FLAC__STREAM_ENCODER_TELL_STATUS_OK;
-#endif
 }
 
 static gboolean
-gst_flac_enc_sink_event (GstPad * pad, GstEvent * event)
+gst_flac_enc_sink_event (GstAudioEncoder * enc, GstEvent * event)
 {
   GstFlacEnc *flacenc;
   GstTagList *taglist;
-  gboolean ret = TRUE;
+  gboolean ret = FALSE;
 
-  flacenc = GST_FLAC_ENC (gst_pad_get_parent (pad));
+  flacenc = GST_FLAC_ENC (enc);
 
   GST_DEBUG ("Received %s event on sinkpad", GST_EVENT_TYPE_NAME (event));
 
@@ -1064,8 +1138,10 @@ gst_flac_enc_sink_event (GstPad * pad, GstEvent * event)
             &stream_time);
       } else {
         start = -1;
+        stream_time = -1;
       }
-      if (start != 0) {
+
+      if (start > 0) {
         if (flacenc->offset > 0)
           GST_DEBUG ("Not handling mid-stream newsegment event");
         else
@@ -1074,44 +1150,39 @@ gst_flac_enc_sink_event (GstPad * pad, GstEvent * event)
         GstEvent *e = gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_BYTES,
             0, -1, 0);
 
-        ret = gst_pad_push_event (flacenc->srcpad, e);
+        ret = gst_pad_push_event (GST_AUDIO_ENCODER_SRC_PAD (enc), e);
       }
-      if (stream_time != 0) {
+
+      if (stream_time > 0) {
         GST_DEBUG ("Not handling non-zero stream time");
       }
-      gst_event_unref (event);
+
       /* don't push it downstream, we'll generate our own via seek to 0 */
+      gst_event_unref (event);
+      ret = TRUE;
       break;
     }
     case GST_EVENT_EOS:
-#ifdef LEGACY_FLAC
-      FLAC__seekable_stream_encoder_finish (flacenc->encoder);
-#else
-      FLAC__stream_encoder_finish (flacenc->encoder);
-#endif
-      ret = gst_pad_event_default (pad, event);
+      flacenc->eos = TRUE;
       break;
     case GST_EVENT_TAG:
       if (flacenc->tags) {
         gst_event_parse_tag (event, &taglist);
-        gst_tag_list_insert (flacenc->tags, taglist, GST_TAG_MERGE_REPLACE);
+        gst_tag_list_insert (flacenc->tags, taglist,
+            gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (flacenc)));
       } else {
         g_assert_not_reached ();
       }
-      ret = gst_pad_event_default (pad, event);
       break;
     default:
-      ret = gst_pad_event_default (pad, event);
       break;
   }
 
-  gst_object_unref (flacenc);
-
   return ret;
 }
 
 static GstFlowReturn
-gst_flac_enc_chain (GstPad * pad, GstBuffer * buffer)
+gst_flac_enc_handle_frame (GstAudioEncoder * enc, GstBuffer * buffer)
 {
   GstFlacEnc *flacenc;
   FLAC__int32 *data;
@@ -1120,14 +1191,26 @@ gst_flac_enc_chain (GstPad * pad, GstBuffer * buffer)
   gulong i;
   FLAC__bool res;
 
-  flacenc = GST_FLAC_ENC (GST_PAD_PARENT (pad));
+  flacenc = GST_FLAC_ENC (enc);
 
-  /* make sure setcaps has been called and the encoder is set up */
-  if (G_UNLIKELY (flacenc->depth == 0))
-    return GST_FLOW_NOT_NEGOTIATED;
+  /* base class ensures configuration */
+  g_return_val_if_fail (flacenc->depth != 0, GST_FLOW_NOT_NEGOTIATED);
 
   width = flacenc->width;
 
+  if (G_UNLIKELY (!buffer)) {
+    if (flacenc->eos) {
+      FLAC__stream_encoder_finish (flacenc->encoder);
+    } else {
+      /* can't handle intermittent draining/resyncing */
+      GST_ELEMENT_WARNING (flacenc, STREAM, FORMAT, (NULL),
+          ("Stream discontinuity detected. "
+              "The output may have wrong timestamps, "
+              "consider using audiorate to handle discontinuities"));
+    }
+    return flacenc->last_flow;
+  }
+
   insize = GST_BUFFER_SIZE (buffer);
   samples = insize / (width >> 3);
 
@@ -1152,15 +1235,8 @@ gst_flac_enc_chain (GstPad * pad, GstBuffer * buffer)
     g_assert_not_reached ();
   }
 
-  gst_buffer_unref (buffer);
-
-#ifdef LEGACY_FLAC
-  res = FLAC__seekable_stream_encoder_process_interleaved (flacenc->encoder,
-      (const FLAC__int32 *) data, samples / flacenc->channels);
-#else
   res = FLAC__stream_encoder_process_interleaved (flacenc->encoder,
       (const FLAC__int32 *) data, samples / flacenc->channels);
-#endif
 
   g_free (data);
 
@@ -1187,112 +1263,58 @@ gst_flac_enc_set_property (GObject * object, guint prop_id,
       gst_flac_enc_update_quality (this, g_value_get_enum (value));
       break;
     case PROP_STREAMABLE_SUBSET:
-#ifdef LEGACY_FLAC
-      FLAC__seekable_stream_encoder_set_streamable_subset (this->encoder,
-          g_value_get_boolean (value));
-#else
       FLAC__stream_encoder_set_streamable_subset (this->encoder,
           g_value_get_boolean (value));
-#endif
       break;
     case PROP_MID_SIDE_STEREO:
-#ifdef LEGACY_FLAC
-      FLAC__seekable_stream_encoder_set_do_mid_side_stereo (this->encoder,
-          g_value_get_boolean (value));
-#else
       FLAC__stream_encoder_set_do_mid_side_stereo (this->encoder,
           g_value_get_boolean (value));
-#endif
       break;
     case PROP_LOOSE_MID_SIDE_STEREO:
-#ifdef LEGACY_FLAC
-      FLAC__seekable_stream_encoder_set_loose_mid_side_stereo (this->encoder,
-          g_value_get_boolean (value));
-#else
       FLAC__stream_encoder_set_loose_mid_side_stereo (this->encoder,
           g_value_get_boolean (value));
-#endif
       break;
     case PROP_BLOCKSIZE:
-#ifdef LEGACY_FLAC
-      FLAC__seekable_stream_encoder_set_blocksize (this->encoder,
-          g_value_get_uint (value));
-#else
       FLAC__stream_encoder_set_blocksize (this->encoder,
           g_value_get_uint (value));
-#endif
       break;
     case PROP_MAX_LPC_ORDER:
-#ifdef LEGACY_FLAC
-      FLAC__seekable_stream_encoder_set_max_lpc_order (this->encoder,
-          g_value_get_uint (value));
-#else
       FLAC__stream_encoder_set_max_lpc_order (this->encoder,
           g_value_get_uint (value));
-#endif
       break;
     case PROP_QLP_COEFF_PRECISION:
-#ifdef LEGACY_FLAC
-      FLAC__seekable_stream_encoder_set_qlp_coeff_precision (this->encoder,
-          g_value_get_uint (value));
-#else
       FLAC__stream_encoder_set_qlp_coeff_precision (this->encoder,
           g_value_get_uint (value));
-#endif
       break;
     case PROP_QLP_COEFF_PREC_SEARCH:
-#ifdef LEGACY_FLAC
-      FLAC__seekable_stream_encoder_set_do_qlp_coeff_prec_search (this->encoder,
-          g_value_get_boolean (value));
-#else
       FLAC__stream_encoder_set_do_qlp_coeff_prec_search (this->encoder,
           g_value_get_boolean (value));
-#endif
       break;
     case PROP_ESCAPE_CODING:
-#ifdef LEGACY_FLAC
-      FLAC__seekable_stream_encoder_set_do_escape_coding (this->encoder,
-          g_value_get_boolean (value));
-#else
       FLAC__stream_encoder_set_do_escape_coding (this->encoder,
           g_value_get_boolean (value));
-#endif
       break;
     case PROP_EXHAUSTIVE_MODEL_SEARCH:
-#ifdef LEGACY_FLAC
-      FLAC__seekable_stream_encoder_set_do_exhaustive_model_search
-          (this->encoder, g_value_get_boolean (value));
-#else
       FLAC__stream_encoder_set_do_exhaustive_model_search (this->encoder,
           g_value_get_boolean (value));
-#endif
       break;
     case PROP_MIN_RESIDUAL_PARTITION_ORDER:
-#ifdef LEGACY_FLAC
-      FLAC__seekable_stream_encoder_set_min_residual_partition_order
-          (this->encoder, g_value_get_uint (value));
-#else
       FLAC__stream_encoder_set_min_residual_partition_order (this->encoder,
           g_value_get_uint (value));
-#endif
       break;
     case PROP_MAX_RESIDUAL_PARTITION_ORDER:
-#ifdef LEGACY_FLAC
-      FLAC__seekable_stream_encoder_set_max_residual_partition_order
-          (this->encoder, g_value_get_uint (value));
-#else
       FLAC__stream_encoder_set_max_residual_partition_order (this->encoder,
           g_value_get_uint (value));
-#endif
       break;
     case PROP_RICE_PARAMETER_SEARCH_DIST:
-#ifdef LEGACY_FLAC
-      FLAC__seekable_stream_encoder_set_rice_parameter_search_dist
-          (this->encoder, g_value_get_uint (value));
-#else
       FLAC__stream_encoder_set_rice_parameter_search_dist (this->encoder,
           g_value_get_uint (value));
-#endif
+      break;
+    case PROP_PADDING:
+      this->padding = g_value_get_uint (value);
+      break;
+    case PROP_SEEKPOINTS:
+      this->seekpoints = g_value_get_int (value);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1315,185 +1337,65 @@ gst_flac_enc_get_property (GObject * object, guint prop_id,
       g_value_set_enum (value, this->quality);
       break;
     case PROP_STREAMABLE_SUBSET:
-#ifdef LEGACY_FLAC
-      g_value_set_boolean (value,
-          FLAC__seekable_stream_encoder_get_streamable_subset (this->encoder));
-#else
       g_value_set_boolean (value,
           FLAC__stream_encoder_get_streamable_subset (this->encoder));
-#endif
       break;
     case PROP_MID_SIDE_STEREO:
-#ifdef LEGACY_FLAC
-      g_value_set_boolean (value,
-          FLAC__seekable_stream_encoder_get_do_mid_side_stereo (this->encoder));
-#else
       g_value_set_boolean (value,
           FLAC__stream_encoder_get_do_mid_side_stereo (this->encoder));
-#endif
       break;
     case PROP_LOOSE_MID_SIDE_STEREO:
-#ifdef LEGACY_FLAC
-      g_value_set_boolean (value,
-          FLAC__seekable_stream_encoder_get_loose_mid_side_stereo
-          (this->encoder));
-#else
       g_value_set_boolean (value,
           FLAC__stream_encoder_get_loose_mid_side_stereo (this->encoder));
-#endif
       break;
     case PROP_BLOCKSIZE:
-#ifdef LEGACY_FLAC
-      g_value_set_uint (value,
-          FLAC__seekable_stream_encoder_get_blocksize (this->encoder));
-#else
       g_value_set_uint (value,
           FLAC__stream_encoder_get_blocksize (this->encoder));
-#endif
       break;
     case PROP_MAX_LPC_ORDER:
-#ifdef LEGACY_FLAC
-      g_value_set_uint (value,
-          FLAC__seekable_stream_encoder_get_max_lpc_order (this->encoder));
-#else
       g_value_set_uint (value,
           FLAC__stream_encoder_get_max_lpc_order (this->encoder));
-#endif
       break;
     case PROP_QLP_COEFF_PRECISION:
-#ifdef LEGACY_FLAC
-      g_value_set_uint (value,
-          FLAC__seekable_stream_encoder_get_qlp_coeff_precision
-          (this->encoder));
-#else
       g_value_set_uint (value,
           FLAC__stream_encoder_get_qlp_coeff_precision (this->encoder));
-#endif
       break;
     case PROP_QLP_COEFF_PREC_SEARCH:
-#ifdef LEGACY_FLAC
-      g_value_set_boolean (value,
-          FLAC__seekable_stream_encoder_get_do_qlp_coeff_prec_search
-          (this->encoder));
-#else
       g_value_set_boolean (value,
           FLAC__stream_encoder_get_do_qlp_coeff_prec_search (this->encoder));
-#endif
       break;
     case PROP_ESCAPE_CODING:
-#ifdef LEGACY_FLAC
-      g_value_set_boolean (value,
-          FLAC__seekable_stream_encoder_get_do_escape_coding (this->encoder));
-#else
       g_value_set_boolean (value,
           FLAC__stream_encoder_get_do_escape_coding (this->encoder));
-#endif
       break;
     case PROP_EXHAUSTIVE_MODEL_SEARCH:
-#ifdef LEGACY_FLAC
-      g_value_set_boolean (value,
-          FLAC__seekable_stream_encoder_get_do_exhaustive_model_search
-          (this->encoder));
-#else
       g_value_set_boolean (value,
           FLAC__stream_encoder_get_do_exhaustive_model_search (this->encoder));
-#endif
       break;
     case PROP_MIN_RESIDUAL_PARTITION_ORDER:
-#ifdef LEGACY_FLAC
-      g_value_set_uint (value,
-          FLAC__seekable_stream_encoder_get_min_residual_partition_order
-          (this->encoder));
-#else
       g_value_set_uint (value,
           FLAC__stream_encoder_get_min_residual_partition_order
           (this->encoder));
-#endif
       break;
     case PROP_MAX_RESIDUAL_PARTITION_ORDER:
-#ifdef LEGACY_FLAC
-      g_value_set_uint (value,
-          FLAC__seekable_stream_encoder_get_max_residual_partition_order
-          (this->encoder));
-#else
       g_value_set_uint (value,
           FLAC__stream_encoder_get_max_residual_partition_order
           (this->encoder));
-#endif
       break;
     case PROP_RICE_PARAMETER_SEARCH_DIST:
-#ifdef LEGACY_FLAC
-      g_value_set_uint (value,
-          FLAC__seekable_stream_encoder_get_rice_parameter_search_dist
-          (this->encoder));
-#else
       g_value_set_uint (value,
           FLAC__stream_encoder_get_rice_parameter_search_dist (this->encoder));
-#endif
       break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    case PROP_PADDING:
+      g_value_set_uint (value, this->padding);
       break;
-  }
-
-  GST_OBJECT_UNLOCK (this);
-}
-
-static GstStateChangeReturn
-gst_flac_enc_change_state (GstElement * element, GstStateChange transition)
-{
-  GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS;
-  GstFlacEnc *flacenc = GST_FLAC_ENC (element);
-
-  switch (transition) {
-    case GST_STATE_CHANGE_NULL_TO_READY:
-    case GST_STATE_CHANGE_READY_TO_PAUSED:
-      flacenc->stopped = FALSE;
+    case PROP_SEEKPOINTS:
+      g_value_set_int (value, this->seekpoints);
       break;
-    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
-    default:
-      break;
-  }
-
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
-
-  switch (transition) {
-    case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
-      break;
-    case GST_STATE_CHANGE_PAUSED_TO_READY:
-#ifdef LEGACY_FLAC
-      if (FLAC__seekable_stream_encoder_get_state (flacenc->encoder) !=
-          FLAC__STREAM_ENCODER_UNINITIALIZED) {
-        flacenc->stopped = TRUE;
-        FLAC__seekable_stream_encoder_finish (flacenc->encoder);
-      }
-#else
-      if (FLAC__stream_encoder_get_state (flacenc->encoder) !=
-          FLAC__STREAM_ENCODER_UNINITIALIZED) {
-        flacenc->stopped = TRUE;
-        FLAC__stream_encoder_finish (flacenc->encoder);
-      }
-#endif
-      flacenc->offset = 0;
-      flacenc->samples_written = 0;
-      flacenc->channels = 0;
-      flacenc->depth = 0;
-      flacenc->sample_rate = 0;
-      if (flacenc->meta) {
-        FLAC__metadata_object_delete (flacenc->meta[0]);
-        g_free (flacenc->meta);
-        flacenc->meta = NULL;
-      }
-      g_list_foreach (flacenc->headers, (GFunc) gst_mini_object_unref, NULL);
-      g_list_free (flacenc->headers);
-      flacenc->headers = NULL;
-      flacenc->got_headers = FALSE;
-      flacenc->last_flow = GST_FLOW_OK;
-      break;
-    case GST_STATE_CHANGE_READY_TO_NULL:
     default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
   }
 
-  return ret;
+  GST_OBJECT_UNLOCK (this);
 }