From c38c0853ebf2979f1321892d42217afb1b9b88fa Mon Sep 17 00:00:00 2001
From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Date: Tue, 20 Nov 2012 14:36:29 +0100
Subject: [PATCH] image: fix GstVaapiImage map and unmap.

Fix gst_vaapi_image_map() to return TRUE and the GstVaapiImageRaw
structure correctly filled in if the image was already mapped.
Likewise, make gst_vaapi_image_unmap() return TRUE if the image
was already unmapped.
---
 gst-libs/gst/vaapi/gstvaapiimage.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/gst-libs/gst/vaapi/gstvaapiimage.c b/gst-libs/gst/vaapi/gstvaapiimage.c
index 0961234bf4..65d79a5e74 100644
--- a/gst-libs/gst/vaapi/gstvaapiimage.c
+++ b/gst-libs/gst/vaapi/gstvaapiimage.c
@@ -753,12 +753,11 @@ _gst_vaapi_image_map(GstVaapiImage *image, GstVaapiImageRaw *raw_image)
 {
     GstVaapiImagePrivate * const priv = image->priv;
     GstVaapiDisplay *display;
-    void *image_data;
     VAStatus status;
     guint i;
 
     if (_gst_vaapi_image_is_mapped(image))
-        return TRUE;
+        goto map_success;
 
     display = GST_VAAPI_OBJECT_DISPLAY(image);
     if (!display)
@@ -767,15 +766,14 @@ _gst_vaapi_image_map(GstVaapiImage *image, GstVaapiImageRaw *raw_image)
     GST_VAAPI_DISPLAY_LOCK(display);
     status = vaMapBuffer(
         GST_VAAPI_DISPLAY_VADISPLAY(display),
-        image->priv->image.buf,
-        &image_data
+        priv->image.buf,
+        (void **)&priv->image_data
     );
     GST_VAAPI_DISPLAY_UNLOCK(display);
     if (!vaapi_check_status(status, "vaMapBuffer()"))
         return FALSE;
 
-    image->priv->image_data = image_data;
-
+map_success:
     if (raw_image) {
         const VAImage * const va_image = &priv->image;
         raw_image->format     = priv->format;
@@ -783,7 +781,8 @@ _gst_vaapi_image_map(GstVaapiImage *image, GstVaapiImageRaw *raw_image)
         raw_image->height     = va_image->height;
         raw_image->num_planes = va_image->num_planes;
         for (i = 0; i < raw_image->num_planes; i++) {
-            raw_image->pixels[i] = (guchar *)image_data + va_image->offsets[i];
+            raw_image->pixels[i] = (guchar *)priv->image_data +
+                va_image->offsets[i];
             raw_image->stride[i] = va_image->pitches[i];
         }
     }
@@ -815,7 +814,7 @@ _gst_vaapi_image_unmap(GstVaapiImage *image)
     VAStatus status;
 
     if (!_gst_vaapi_image_is_mapped(image))
-        return FALSE;
+        return TRUE;
 
     display = GST_VAAPI_OBJECT_DISPLAY(image);
     if (!display)