Add support for AYUV format.

diff --git a/NEWS b/NEWS
index a1cadd54854b90a74cc69f9ecf0a5563398cd433..4f8a184bbc4459e599bc177dc234adb7815d6dea 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,9 @@
-gst-vaapi NEWS -- summary of changes.  2010-03-23
+gst-vaapi NEWS -- summary of changes.  2010-03-DD
 Copyright (C) 2010 Splitted-Desktop Systems
 
+Version 0.1.2 - DD.Mar.2010
+* Add AYUV image format
+
 Version 0.1.1 - 23.Mar.2010
 * Document public API for libgstvaapi-*.so.*
 * Optimize `vaapiconvert' pipeline (direct-rendering)

diff --git a/gst-libs/gst/vaapi/gstvaapiimage.c b/gst-libs/gst/vaapi/gstvaapiimage.c
index 0a354dec9c0a89ccd67c33054d0858f89decf2b4..e5de6ece4a4df6414ba765f987671b8f745a2724 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapiimage.c
+++ b/gst-libs/gst/vaapi/gstvaapiimage.c
@@ -129,6 +129,7 @@ vaapi_image_is_linear(const VAImage *va_image)
     case VA_FOURCC('I','4','2','0'):
         data_size = width * height + 2 * width2 * height2;
         break;
+    case VA_FOURCC('A','Y','U','V'):
     case VA_FOURCC('A','R','G','B'):
     case VA_FOURCC('R','G','B','A'):
     case VA_FOURCC('A','B','G','R'):

diff --git a/gst-libs/gst/vaapi/gstvaapiimageformat.c b/gst-libs/gst/vaapi/gstvaapiimageformat.c
index bf52dee00675840da2b24b3460d6e54bc1f1a674..45d2f75f7eb7a9ae845c00d0d5e2481936e08001 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapiimageformat.c
+++ b/gst-libs/gst/vaapi/gstvaapiimageformat.c
@@ -60,6 +60,7 @@ static const GstVaapiImageFormatMap gst_vaapi_image_formats[] = {
     DEF_YUV(NV12, ('N','V','1','2'), LSB, 12),
     DEF_YUV(YV12, ('Y','V','1','2'), LSB, 12),
     DEF_YUV(I420, ('I','4','2','0'), LSB, 12),
+    DEF_YUV(AYUV, ('A','Y','U','V'), LSB, 32),
 #if G_BYTE_ORDER == G_BIG_ENDIAN
     DEF_RGB(ARGB, ('A','R','G','B'), MSB, 32,
             32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000),

diff --git a/gst-libs/gst/vaapi/gstvaapiimageformat.h b/gst-libs/gst/vaapi/gstvaapiimageformat.h
index afa5b8c3492dec148253757eb09e12470b96fee3..c26f006e6788a3c37b2afef252d80e1ee5d7902d 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapiimageformat.h
+++ b/gst-libs/gst/vaapi/gstvaapiimageformat.h
@@ -36,6 +36,8 @@ typedef enum _GstVaapiImageFormat               GstVaapiImageFormat;
  *   planar YUV 4:2:0, 12-bit, 3 planes for Y V U
  * @GST_VAAPI_IMAGE_I420:
  *   planar YUV 4:2:0, 12-bit, 3 planes for Y U V
+ * @GST_VAAPI_IMAGE_AYUV:
+ *   packed YUV 4:4:4, 32-bit, A Y U V, native endian byte-order
  * @GST_VAAPI_IMAGE_ARGB:
  *   packed RGB 8:8:8, 32-bit, A R G B
  * @GST_VAAPI_IMAGE_RGBA:
@@ -51,6 +53,7 @@ enum _GstVaapiImageFormat {
     GST_VAAPI_IMAGE_NV12 = VA_FOURCC('N','V','1','2'),
     GST_VAAPI_IMAGE_YV12 = VA_FOURCC('Y','V','1','2'),
     GST_VAAPI_IMAGE_I420 = VA_FOURCC('I','4','2','0'),
+    GST_VAAPI_IMAGE_AYUV = VA_FOURCC('A','Y','U','V'),
     GST_VAAPI_IMAGE_ARGB = VA_FOURCC('A','R','G','B'),
     GST_VAAPI_IMAGE_RGBA = VA_FOURCC('R','G','B','A'),
     GST_VAAPI_IMAGE_ABGR = VA_FOURCC('A','B','G','R'),

diff --git a/tests/test-windows.c b/tests/test-windows.c
index b3ecd23320089daaabb9e718be780309708db74b..3aa4a509bfa68736f53db823a9dba65d8c282436 100644 (file)
--- a/tests/test-windows.c
+++ b/tests/test-windows.c
@@ -179,6 +179,27 @@ static void draw_rect_YV12( // Y, U, V planes
         }
 }
 
+static void draw_rect_AYUV(
+    guchar *pixels[3],
+    guint   stride[3],
+    gint    x,
+    gint    y,
+    guint   width,
+    guint   height,
+    guint32 color
+)
+{
+    guint i, j;
+
+    color = color | 0xff000000;
+
+    for (j = 0; j < height; j++) {
+        guint32 *p = (guint32 *)(pixels[0] + (y + j) * stride[0] + x * 4);
+        for (i = 0; i < width; i++)
+            p[i] = color;
+    }
+}
+
 static gboolean draw_rgb_rects(GstVaapiImage *image)
 {
     GstVaapiImageFormat format = GST_VAAPI_IMAGE_FORMAT(image);
@@ -236,6 +257,11 @@ static gboolean draw_rgb_rects(GstVaapiImage *image)
         stride[1]   = gst_vaapi_image_get_pitch(image, 1);
         pixels[2]   = gst_vaapi_image_get_plane(image, 2);
         stride[2]   = gst_vaapi_image_get_pitch(image, 2);
+        goto YUV_colors;
+    case GST_VAAPI_IMAGE_AYUV:
+        draw_rect   = draw_rect_AYUV;
+        pixels[0]   = gst_vaapi_image_get_plane(image, 0);
+        stride[0]   = gst_vaapi_image_get_pitch(image, 0);
     YUV_colors:
         red_color   = 0x515af0;
         green_color = 0x913622;
@@ -311,6 +337,7 @@ main(int argc, char *argv[])
         GST_VAAPI_IMAGE_NV12,
         GST_VAAPI_IMAGE_YV12,
         GST_VAAPI_IMAGE_I420,
+        GST_VAAPI_IMAGE_AYUV,
         GST_VAAPI_IMAGE_ARGB,
         GST_VAAPI_IMAGE_BGRA,
         GST_VAAPI_IMAGE_RGBA,