From 09552b15593e90a001273714dcc9761789e147d3 Mon Sep 17 00:00:00 2001
From: gb <gb@5584edef-b1fe-4b99-b61b-dd2bab72e969>
Date: Mon, 3 May 2010 21:14:01 +0000
Subject: [PATCH] More simplifications.

---
 gst-libs/gst/vaapi/gstvaapidecoder.c        | 64 +++++++++--------------------
 gst-libs/gst/vaapi/gstvaapidecoder_ffmpeg.c |  4 +-
 2 files changed, 22 insertions(+), 46 deletions(-)

diff --git a/gst-libs/gst/vaapi/gstvaapidecoder.c b/gst-libs/gst/vaapi/gstvaapidecoder.c
index 3170fde..cba83b2 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder.c
+++ b/gst-libs/gst/vaapi/gstvaapidecoder.c
@@ -38,13 +38,6 @@
 
 G_DEFINE_TYPE(GstVaapiDecoder, gst_vaapi_decoder, G_TYPE_OBJECT);
 
-/* XXX: Make it a GstVaapiDecodedSurface? */
-typedef struct _DecodedSurface DecodedSurface;
-struct _DecodedSurface {
-    GstVaapiSurfaceProxy *proxy;
-    GstVaapiDecoderStatus status;
-};
-
 enum {
     PROP_0,
 
@@ -140,18 +133,6 @@ decode_step(GstVaapiDecoder *decoder)
     return status;
 }
 
-static inline DecodedSurface *
-create_surface(void)
-{
-    return g_slice_new0(DecodedSurface);
-}
-
-static inline void
-destroy_surface(DecodedSurface *ds)
-{
-    g_slice_free(DecodedSurface, ds);
-}
-
 static gboolean
 push_surface(
     GstVaapiDecoder *decoder,
@@ -160,27 +141,21 @@ push_surface(
 )
 {
     GstVaapiDecoderPrivate * const priv = decoder->priv;
-    DecodedSurface *ds;
-
-    ds = create_surface();
-    if (!ds)
-        return FALSE;
+    GstVaapiSurfaceProxy *proxy;
 
     GST_DEBUG("queue decoded surface %" GST_VAAPI_ID_FORMAT,
               GST_VAAPI_ID_ARGS(GST_VAAPI_OBJECT_ID(surface)));
-    ds->proxy = gst_vaapi_surface_proxy_new(priv->context, surface);
-    if (ds->proxy) {
-        ds->status = GST_VAAPI_DECODER_STATUS_SUCCESS;
-        gst_vaapi_surface_proxy_set_timestamp(ds->proxy, timestamp);
-    }
-    else
-        ds->status = GST_VAAPI_DECODER_STATUS_ERROR_ALLOCATION_FAILED;
 
-    g_queue_push_tail(priv->surfaces, ds);
+    proxy = gst_vaapi_surface_proxy_new(priv->context, surface);
+    if (!proxy)
+        return FALSE;
+
+    gst_vaapi_surface_proxy_set_timestamp(proxy, timestamp);
+    g_queue_push_tail(priv->surfaces, proxy);
     return TRUE;
 }
 
-static inline DecodedSurface *
+static inline GstVaapiSurfaceProxy *
 pop_surface(GstVaapiDecoder *decoder)
 {
     GstVaapiDecoderPrivate * const priv = decoder->priv;
@@ -229,7 +204,7 @@ gst_vaapi_decoder_finalize(GObject *object)
     }
 
     if (priv->surfaces) {
-        clear_queue(priv->surfaces, (GDestroyNotify)destroy_surface);
+        clear_queue(priv->surfaces, (GDestroyNotify)g_object_unref);
         g_queue_free(priv->surfaces);
         priv->surfaces = NULL;
     }
@@ -423,25 +398,24 @@ gst_vaapi_decoder_get_surface(
     GstVaapiDecoderStatus *pstatus
 )
 {
-    GstVaapiSurfaceProxy *proxy  = NULL;
-    GstVaapiDecoderStatus status = GST_VAAPI_DECODER_STATUS_ERROR_NO_DATA;
-    DecodedSurface *ds;
+    GstVaapiSurfaceProxy *proxy;
+    GstVaapiDecoderStatus status;
+
+    if (pstatus)
+        *pstatus = GST_VAAPI_DECODER_STATUS_ERROR_UNKNOWN;
 
     g_return_val_if_fail(GST_VAAPI_IS_DECODER(decoder), NULL);
 
-    ds = pop_surface(decoder);
-    if (!ds) {
+    proxy = pop_surface(decoder);
+    if (!proxy) {
         do {
             status = decode_step(decoder);
         } while (status == GST_VAAPI_DECODER_STATUS_SUCCESS);
-        ds = pop_surface(decoder);
+        proxy = pop_surface(decoder);
     }
 
-    if (ds) {
-        proxy  = ds->proxy;
-        status = ds->status;
-        destroy_surface(ds);
-    }
+    if (proxy)
+        status = GST_VAAPI_DECODER_STATUS_SUCCESS;
 
     if (pstatus)
         *pstatus = status;
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_ffmpeg.c b/gst-libs/gst/vaapi/gstvaapidecoder_ffmpeg.c
index 669022b..7ca9001 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_ffmpeg.c
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_ffmpeg.c
@@ -472,7 +472,9 @@ decode_frame(GstVaapiDecoderFfmpeg *ffdecoder, guchar *buf, guint buf_size)
     if (!surface)
         return GST_VAAPI_DECODER_STATUS_ERROR_INVALID_SURFACE;
 
-    gst_vaapi_decoder_push_surface(GST_VAAPI_DECODER_CAST(ffdecoder), surface, priv->frame->pts);
+    if (!gst_vaapi_decoder_push_surface(GST_VAAPI_DECODER_CAST(ffdecoder),
+                                        surface, priv->frame->pts))
+        return GST_VAAPI_DECODER_STATUS_ERROR_ALLOCATION_FAILED;
     return GST_VAAPI_DECODER_STATUS_SUCCESS;
 }
 
-- 
2.7.4