From d68288b5975dd9bd3a75fef1b43b41660e5b4566 Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Wed, 23 Mar 2011 22:17:49 +0100
Subject: [PATCH] basevideoencoder: elaborate finish to draining

---
 gst-libs/gst/video/gstbasevideoencoder.c | 42 ++++++++++++++++++++++--
 gst-libs/gst/video/gstbasevideoencoder.h |  1 +
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/gst-libs/gst/video/gstbasevideoencoder.c b/gst-libs/gst/video/gstbasevideoencoder.c
index 9fd8f36378..94eebd534e 100644
--- a/gst-libs/gst/video/gstbasevideoencoder.c
+++ b/gst-libs/gst/video/gstbasevideoencoder.c
@@ -80,6 +80,7 @@ gst_base_video_encoder_reset (GstBaseVideoEncoder * base_video_encoder)
   base_video_encoder->force_keyframe = FALSE;
 
   base_video_encoder->set_output_caps = FALSE;
+  base_video_encoder->drained = TRUE;
   base_video_encoder->min_latency = 0;
   base_video_encoder->max_latency = 0;
 
@@ -121,6 +122,43 @@ gst_base_video_encoder_init (GstBaseVideoEncoder * base_video_encoder,
   base_video_encoder->sink_clipping = TRUE;
 }
 
+static gboolean
+gst_base_video_encoder_drain (GstBaseVideoEncoder * enc)
+{
+  GstBaseVideoCodec *codec;
+  GstBaseVideoEncoderClass *enc_class;
+  gboolean ret = TRUE;
+
+  codec = GST_BASE_VIDEO_CODEC (enc);
+  enc_class = GST_BASE_VIDEO_ENCODER_GET_CLASS (enc);
+
+  GST_DEBUG_OBJECT (enc, "draining");
+
+  if (enc->drained) {
+    GST_DEBUG_OBJECT (enc, "already drained");
+    return TRUE;
+  }
+
+  if (enc_class->finish) {
+    GST_DEBUG_OBJECT (enc, "requesting subclass to finish");
+    ret = enc_class->finish (enc);
+  }
+  /* everything should be away now */
+  if (codec->frames) {
+    /* not fatal/impossible though if subclass/codec eats stuff */
+    GST_WARNING_OBJECT (enc, "still %d frames left after draining",
+        g_list_length (codec->frames));
+#if 0
+    /* FIXME should do this, but subclass may come up with it later on ?
+     * and would then need refcounting or so on frames */
+    g_list_foreach (codec->frames,
+        (GFunc) gst_base_video_codec_free_frame, NULL);
+#endif
+  }
+
+  return ret;
+}
+
 static gboolean
 gst_base_video_encoder_sink_setcaps (GstPad * pad, GstCaps * caps)
 {
@@ -197,9 +235,7 @@ gst_base_video_encoder_sink_eventfunc (GstBaseVideoEncoder * base_video_encoder,
     case GST_EVENT_EOS:
     {
       base_video_encoder->a.at_eos = TRUE;
-      if (base_video_encoder_class->finish) {
-        base_video_encoder_class->finish (base_video_encoder);
-      }
+      gst_base_video_encoder_drain (base_video_encoder);
       break;
     }
     case GST_EVENT_NEWSEGMENT:
diff --git a/gst-libs/gst/video/gstbasevideoencoder.h b/gst-libs/gst/video/gstbasevideoencoder.h
index 900d707d08..69abd76230 100644
--- a/gst-libs/gst/video/gstbasevideoencoder.h
+++ b/gst-libs/gst/video/gstbasevideoencoder.h
@@ -74,6 +74,7 @@ struct _GstBaseVideoEncoder
   /*< private >*/
   /* FIXME move to real private part ? */
   gboolean set_output_caps;
+  gboolean drained;
 
   gint64 min_latency;
   gint64 max_latency;