refact: tests, move surface map from ColorConvert to utils

EncodeInputDecoder and other places need this

tests/decodeoutput.cpp

@@ -31,6 +31,7 @@
 #include "common/log.h"
 #include "common/utils.h"
 #include "vaapi/vaapiutils.h"
+#include "vaapi/vaapiimageutils.h"
 
 #if __ENABLE_MD5__
 #include <openssl/md5.h>
@@ -55,7 +56,7 @@
 #include <stdio.h>
 #include <assert.h>
 
-using YamiMediaCodec::checkVaapiStatus;
+using namespace YamiMediaCodec;
 using std::vector;
 
 bool DecodeOutput::init()
@@ -144,7 +145,7 @@ class ColorConvert {
             return false;
         }
         VAImage image;
-        uint8_t* p = map(src->surface, image);
+        uint8_t* p = mapSurfaceToImage(*m_display, src->surface, image);
         if (!p) {
             ERROR("failed to map VAImage");
             return false;
@@ -156,7 +157,7 @@ class ColorConvert {
         copyY(dest, p, image.offsets[0], width, height, image.pitches[0]);
         copyUV(dest, p, image.offsets[1], width, height, image.pitches[1]);
         copyUV(dest, p, image.offsets[1] + 1, width, height, image.pitches[1]);
-        unmap(image);
+        unmapImage(*m_display, image);
         return true;
     }
 
@@ -187,24 +188,6 @@ class ColorConvert {
         }
 
     }
-    uint8_t* map(intptr_t surface, VAImage& image)
-    {
-        uint8_t* p = NULL;
-        VAStatus status = vaDeriveImage(*m_display, (VASurfaceID)surface, &image);
-        if (!checkVaapiStatus(status, "vaDeriveImage"))
-            return NULL;
-        status = vaMapBuffer(*m_display, image.buf, (void**)&p);
-        if (!checkVaapiStatus(status, "vaMapBuffer")) {
-            checkVaapiStatus(vaDestroyImage(*m_display, image.image_id), "vaDestroyImage");
-            return NULL;
-        }
-        return p;
-    }
-    void unmap(const VAImage& image)
-    {
-        checkVaapiStatus(vaUnmapBuffer(*m_display, image.buf), "vaUnmapBuffer");
-        checkVaapiStatus(vaDestroyImage(*m_display, image.image_id), "vaDestroyImage");
-    }
 
     bool init(uint32_t width, uint32_t height)
     {

vaapi/Android.mk

@@ -7,6 +7,7 @@ LOCAL_SRC_FILES := \
         vaapibuffer.cpp \
         vaapiimage.cpp \
         vaapisurface.cpp\
+        vaapiimageutils.cpp \
         vaapiutils.cpp \
         vaapidisplay.cpp \
         vaapicontext.cpp \

vaapi/Makefile.am

@@ -5,6 +5,7 @@ libyami_vaapi_source_c = \
 	vaapibuffer.cpp \
 	vaapiimage.cpp \
 	vaapisurface.cpp\
+	vaapiimageutils.cpp \
 	vaapiutils.cpp \
 	vaapidisplay.cpp \
 	vaapicontext.cpp \
@@ -17,6 +18,7 @@ libyami_vaapi_source_h_priv = \
 	vaapibuffer.h \
 	vaapiimage.h \
 	vaapisurface.h \
+	vaapiimageutils.h \
 	vaapiutils.h \
 	vaapitypes.h \
 	vaapidisplay.h \

vaapi/vaapiimageutils.cpp

@@ -0,0 +1,53 @@
+/*
+ *  vaapiimageutils.cpp - vaapi image utils
+ *
+ *  Copyright (C) 2011-2014 Intel Corporation
+ *    Author: Xu Guangxin<[email protected]>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "vaapiimageutils.h"
+
+#include "vaapiutils.h"
+
+namespace YamiMediaCodec{
+
+uint8_t* mapSurfaceToImage(VADisplay display, intptr_t surface, VAImage& image)
+{
+    uint8_t* p = NULL;
+    VAStatus status = vaDeriveImage(display, (VASurfaceID)surface, &image);
+    if (!checkVaapiStatus(status, "vaDeriveImage"))
+        return NULL;
+    status = vaMapBuffer(display, image.buf, (void**)&p);
+    if (!checkVaapiStatus(status, "vaMapBuffer")) {
+        checkVaapiStatus(vaDestroyImage(display, image.image_id), "vaDestroyImage");
+        return NULL;
+    }
+    return p;
+}
+
+void unmapImage(VADisplay display, const VAImage& image)
+{
+    checkVaapiStatus(vaUnmapBuffer(display, image.buf), "vaUnmapBuffer");
+    checkVaapiStatus(vaDestroyImage(display, image.image_id), "vaDestroyImage");
+}
+
+}

vaapi/vaapiimageutils.h

@@ -0,0 +1,32 @@
+/*
+ *  vaapiimageutils.h - vaapi image utils
+ *
+ *  Copyright (C) 2011-2014 Intel Corporation
+ *    Author: Xu Guangxin<[email protected]>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+#include <va/va.h>
+
+namespace YamiMediaCodec{
+
+uint8_t* mapSurfaceToImage(VADisplay display, intptr_t surface, VAImage& image);
+
+void unmapImage(VADisplay display, const VAImage& image);
+
+} //namespace YamiMediaCodec