test: fix an issue in loading YV12 surface

[android-x86/hardware-intel-libva.git] / test / android_winsys.cpp

diff --git a/test/android_winsys.cpp b/test/android_winsys.cpp
index 6f84e38..3c6a245 100644 (file)
--- a/test/android_winsys.cpp
+++ b/test/android_winsys.cpp
@@ -1,32 +1,51 @@
+/*
+ * Copyright (c) 2012 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#include <ui/DisplayInfo.h>
 
 namespace android {
-    class Test {
-        public:
-                static const sp<ISurface>& getISurface(const sp<Surface>& s) {
-                            return s->getISurface();
-                }
-    };
 };
 
-#define SURFACE_CREATE(client,surface_ctrl,android_surface, android_isurface, win_width, win_height) \
-{\
-    client = new SurfaceComposerClient();\
-    surface_ctrl = client->createSurface(getpid(), 0, win_width, win_height, PIXEL_FORMAT_RGB_565, ISurfaceComposer::ePushBuffers);\
-    android_surface = surface_ctrl->getSurface();\
-    android_isurface = Test::getISurface(android_surface);\
-\
-    client->openTransaction();\
-    surface_ctrl->setPosition(0, 0);\
-    client->closeTransaction();\
-\
-    client->openTransaction();\
-    surface_ctrl->setSize(win_width, win_height);\
-    client->closeTransaction();\
-\
-    client->openTransaction();\
-    surface_ctrl->setLayer(0x100000);\
-    client->closeTransaction();\
-\
-}\
+#define min(a,b) (a<b?a:b)
+#define SURFACE_CREATE(client,surface_ctrl,android_surface, android_isurface, x, y, win_width, win_height) \
+do {                                                                    \
+    client = new SurfaceComposerClient();                               \
+    android::DisplayInfo info;                                          \
+    int w, h;                                                           \
+                                                                        \
+    client->getDisplayInfo(android::DisplayID(0), &info);               \
+    /*w = min(win_width, info.w);*/                                     \
+    /*h = min(win_height, info.h);*/                                    \
+    w = win_width, h = win_height;                                      \
+                                                                        \
+    surface_ctrl = client->createSurface(getpid(), 0, w, h, PIXEL_FORMAT_RGB_565); \
+    android_surface = surface_ctrl->getSurface();                       \
+                                                                        \
+    client->openGlobalTransaction();                                          \
+    surface_ctrl->setPosition(x, y);                                    \
+    surface_ctrl->setSize(w, h);                                        \
+    surface_ctrl->setLayer(0x100000);                                   \
+    client->closeGlobalTransaction();                                         \
+} while (0)