rev 0.29 (02/07/2007 Jonathan Bian) - VC1 parameter fixes,

                                      added VA_STATUS_ERROR_RESOLUTION_NOT_SUPPORTED
rev 0.28 (12/06/2007 Jonathan Bian) - Added new versions of PutImage and AssociateSubpicture
                                      to enable scaling
rev 0.27 (11/19/2007 Matt Sottek)   - Added DeriveImage

4 files changed, 258 insertions, 2 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index c2fb501..aeb89fe 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -21,7 +21,7 @@
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 check_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \
-		test_07 test_08 test_09 test_10 test_11
+		test_07 test_08 test_09 test_10 test_11 test_12
 
 bin_PROGRAMS = vainfo
 
@@ -69,6 +69,9 @@ test_10_SOURCES = test_10.c
 test_11_LDADD = $(TEST_LIBS)
 test_11_SOURCES = test_11.c
 
+test_12_LDADD = $(TEST_LIBS)
+test_12_SOURCES = test_12.c
+
 
 valgrind:	$(check_PROGRAMS)
 	for a in $(check_PROGRAMS); do \
diff --git a/test/test_12.c b/test/test_12.c
new file mode 100644
index 0000000..dcc7021
--- /dev/null
+++ b/test/test_12.c
@@ -0,0 +1,250 @@
+/*
+ * Copyright (c) 2007 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.
+ */
+
+#define TEST_DESCRIPTION	"Sample MPEG2 VLD Decoding"
+
+#include "test_common.c"
+
+#include <X11/Xlib.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include "va_x11.h"
+
+void pre()
+{
+    test_init();
+}
+
+/* Data dump of a 16x16 MPEG2 video clip,it has one I frame
+ */
+static unsigned char mpeg2_clip[]={
+    0x00,0x00,0x01,0xb3,0x01,0x00,0x10,0x13,0xff,0xff,0xe0,0x18,0x00,0x00,0x01,0xb5,
+    0x14,0x8a,0x00,0x01,0x00,0x00,0x00,0x00,0x01,0xb8,0x00,0x08,0x00,0x00,0x00,0x00,
+    0x01,0x00,0x00,0x0f,0xff,0xf8,0x00,0x00,0x01,0xb5,0x8f,0xff,0xf3,0x41,0x80,0x00,
+    0x00,0x01,0x01,0x13,0xe1,0x00,0x15,0x81,0x54,0xe0,0x2a,0x05,0x43,0x00,0x2d,0x60,
+    0x18,0x01,0x4e,0x82,0xb9,0x58,0xb1,0x83,0x49,0xa4,0xa0,0x2e,0x05,0x80,0x4b,0x7a,
+    0x00,0x01,0x38,0x20,0x80,0xe8,0x05,0xff,0x60,0x18,0xe0,0x1d,0x80,0x98,0x01,0xf8,
+    0x06,0x00,0x54,0x02,0xc0,0x18,0x14,0x03,0xb2,0x92,0x80,0xc0,0x18,0x94,0x42,0x2c,
+    0xb2,0x11,0x64,0xa0,0x12,0x5e,0x78,0x03,0x3c,0x01,0x80,0x0e,0x80,0x18,0x80,0x6b,
+    0xca,0x4e,0x01,0x0f,0xe4,0x32,0xc9,0xbf,0x01,0x42,0x69,0x43,0x50,0x4b,0x01,0xc9,
+    0x45,0x80,0x50,0x01,0x38,0x65,0xe8,0x01,0x03,0xf3,0xc0,0x76,0x00,0xe0,0x03,0x20,
+    0x28,0x18,0x01,0xa9,0x34,0x04,0xc5,0xe0,0x0b,0x0b,0x04,0x20,0x06,0xc0,0x89,0xff,
+    0x60,0x12,0x12,0x8a,0x2c,0x34,0x11,0xff,0xf6,0xe2,0x40,0xc0,0x30,0x1b,0x7a,0x01,
+    0xa9,0x0d,0x00,0xac,0x64
+};
+
+/* hardcoded here without a bitstream parser helper
+ * please see picture mpeg2-I.jpg for bitstream details
+ */
+static VAPictureParameterBufferMPEG2 pic_param={
+  horizontal_size:16,
+  vertical_size:16,
+  forward_reference_picture:0xffffffff,
+  backward_reference_picture:0xffffffff,
+  picture_coding_type:1,
+  f_code:0xffff,
+  {
+      {
+        intra_dc_precision:0,
+        picture_structure:3,
+        top_field_first:0,
+        frame_pred_frame_dct:1,
+        concealment_motion_vectors:0,
+        q_scale_type:0,
+        intra_vlc_format:0,
+        alternate_scan:0,
+        repeat_first_field:0,
+        progressive_frame:1 ,
+        is_first_field:1
+      },
+  }
+};
+
+/* see MPEG2 spec65 for the defines of matrix */
+static VAIQMatrixBufferMPEG2 iq_matrix = {
+  load_intra_quantiser_matrix:1,
+  load_non_intra_quantiser_matrix:1,
+  load_chroma_intra_quantiser_matrix:0,
+  load_chroma_non_intra_quantiser_matrix:0,
+  intra_quantiser_matrix:{
+         8, 16, 16, 19, 16, 19, 22, 22,
+        22, 22, 22, 22, 26, 24, 26, 27,
+        27, 27, 26, 26, 26, 26, 27, 27,
+        27, 29, 29, 29, 34, 34, 34, 29,
+        29, 29, 27, 27, 29, 29, 32, 32,
+        34, 34, 37, 38, 37, 35, 35, 34,
+        35, 38, 38, 40, 40, 40, 48, 48,
+        46, 46, 56, 56, 58, 69, 69, 83
+    },
+  non_intra_quantiser_matrix:{16},
+  chroma_intra_quantiser_matrix:{0},
+  chroma_non_intra_quantiser_matrix:{0}
+};
+
+static VASliceParameterBufferMPEG2 slice_param={
+  slice_data_size:150,
+  slice_data_offset:0,
+  slice_data_flag:0,
+  macroblock_offset:38,/* 4byte + 6bits=38bits */
+  slice_vertical_position:0,
+  quantiser_scale_code:2,
+  intra_slice_flag:0
+};
+
+#define CLIP_WIDTH  16
+#define CLIP_HEIGHT 16
+
+int surf_width=CLIP_WIDTH,surf_height=CLIP_HEIGHT;
+int win_width=CLIP_WIDTH<<1,win_height=CLIP_HEIGHT<<1;
+
+void test()
+{
+    VAEntrypoint entrypoints[5];
+    int num_entrypoints,vld_entrypoint;
+    VAConfigAttrib attrib;
+    VAConfigID config_id;
+    VASurfaceID vaSurface;
+    VAContextID vaContext;
+    VABufferID vaPicParamBuf,vaIQMatrixBuf,vaSliceParamBuf,vaSliceDataBuf;
+    Window win = 0;
+    
+    va_status = vaQueryConfigEntrypoints(va_dpy, VAProfileMPEG2Main, entrypoints, 
+                             &num_entrypoints);
+    ASSERT( VA_STATUS_SUCCESS == va_status );
+
+    for	(vld_entrypoint = 0; vld_entrypoint < num_entrypoints; vld_entrypoint++) {
+        if (entrypoints[vld_entrypoint] == VAEntrypointVLD)
+            break;
+    }
+    if (vld_entrypoint == num_entrypoints) {
+        /* not find VLD entry point */
+        ASSERT(0);
+    }
+
+    /* Assuming finding VLD, find out the format for the render target */
+    attrib.type = VAConfigAttribRTFormat;
+    va_status = vaGetConfigAttributes(va_dpy, VAProfileMPEG2Main, VAEntrypointVLD,
+                          &attrib, 1);
+    ASSERT( VA_STATUS_SUCCESS == va_status );
+    if ((attrib.value & VA_RT_FORMAT_YUV420) == 0) {
+        /* not find desired YUV420 RT format */
+        ASSERT(0);
+    }
+    
+    va_status = vaCreateConfig(va_dpy, VAProfileMPEG2Main, VAEntrypointVLD,
+                              &attrib, 1,&config_id);
+    ASSERT( VA_STATUS_SUCCESS == va_status );
+    
+    va_status = vaCreateSurfaces(va_dpy,surf_width,surf_height,
+                                VA_RT_FORMAT_YUV420, 1, &vaSurface);
+    ASSERT( VA_STATUS_SUCCESS == va_status );
+
+    /* Create a context for this decode pipe */
+    va_status = vaCreateContext(va_dpy, config_id,
+                               CLIP_WIDTH,
+                               ((CLIP_HEIGHT+15)/16)*16,
+                               VA_PROGRESSIVE,
+                               &vaSurface,
+                               1,
+                               &vaContext);
+    ASSERT( VA_STATUS_SUCCESS == va_status );
+    
+    va_status = vaCreateBuffer(va_dpy, vaContext,
+                              VAPictureParameterBufferType,
+                              sizeof(VAPictureParameterBufferMPEG2),
+                              1, &pic_param,
+                              &vaPicParamBuf);
+    ASSERT( VA_STATUS_SUCCESS == va_status );
+
+    va_status = vaCreateBuffer(va_dpy, vaContext,
+                              VAIQMatrixBufferType,
+                              sizeof(VAIQMatrixBufferMPEG2),
+                              1, &iq_matrix,
+                              &vaIQMatrixBuf );
+    ASSERT( VA_STATUS_SUCCESS == va_status );
+                
+    va_status = vaCreateBuffer(va_dpy, vaContext,
+                              VASliceParameterBufferType,
+                              sizeof(VASliceParameterBufferMPEG2),
+                              1,
+                              &slice_param, &vaSliceParamBuf);
+    ASSERT( VA_STATUS_SUCCESS == va_status );
+
+    va_status = vaCreateBuffer(va_dpy, vaContext,
+                              VASliceDataBufferType,
+                              0xc4-0x2f+1,
+                              1,
+                              mpeg2_clip+0x2f,
+                              &vaSliceDataBuf);
+    ASSERT( VA_STATUS_SUCCESS == va_status );
+
+    va_status = vaBeginPicture(va_dpy, vaContext, vaSurface);
+    ASSERT( VA_STATUS_SUCCESS == va_status );
+    
+    va_status = vaRenderPicture(va_dpy,vaContext, &vaPicParamBuf, 1);
+    ASSERT( VA_STATUS_SUCCESS == va_status );
+
+    va_status = vaRenderPicture(va_dpy,vaContext, &vaIQMatrixBuf, 1);
+    ASSERT( VA_STATUS_SUCCESS == va_status );
+
+    va_status = vaRenderPicture(va_dpy,vaContext, &vaSliceParamBuf, 1);
+    ASSERT( VA_STATUS_SUCCESS == va_status );
+
+    va_status = vaRenderPicture(va_dpy,vaContext, &vaSliceDataBuf, 1);
+    ASSERT( VA_STATUS_SUCCESS == va_status );
+
+    va_status = vaEndPicture(va_dpy,vaContext);
+    ASSERT( VA_STATUS_SUCCESS == va_status );
+
+    va_status = vaSyncSurface(va_dpy, vaContext, vaSurface);
+    ASSERT( VA_STATUS_SUCCESS == va_status );
+    
+    win = XCreateSimpleWindow(dpy, RootWindow(dpy, 0), 0, 0,
+                              win_width,win_height, 0, 0, WhitePixel(dpy, 0));
+    XMapWindow(dpy, win);
+    XSync(dpy, False);
+
+#if 0
+    va_status = vaPutSurface(va_dpy, vaSurface, win,
+                            0,0,surf_width,surf_height,
+                            0,0,win_width,win_height,
+                            NULL,0,0);
+#endif
+    ASSERT( VA_STATUS_SUCCESS == va_status );
+
+    printf("press any key to exit\n");
+    getchar();
+    
+    vaDestroySurfaces(va_dpy,&vaSurface,1);
+    vaDestroyConfig(va_dpy,config_id);
+    vaDestroyContext(va_dpy,vaContext);
+}
+
+void post()
+{
+    test_terminate();
+}
diff --git a/test/test_common.c b/test/test_common.c
index 9069668..b3b4ccb 100644
--- a/test/test_common.c
+++ b/test/test_common.c
@@ -28,6 +28,7 @@
 #include "assert.h"
 #include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
 #include <dlfcn.h>
diff --git a/test/vainfo.c b/test/vainfo.c
index a793e14..09d34f6 100644
--- a/test/vainfo.c
+++ b/test/vainfo.c
@@ -28,7 +28,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
-
+#include <stdlib.h>
 
 int main(int argc, const char* argv[])
 {
@@ -64,8 +64,10 @@ int main(int argc, const char* argv[])
   {
       fprintf(stderr, "%s: vaInitialize failed with error code %d (%s)\n", 
               name, va_status, vaErrorStr(va_status));
+      return 3;
   }
   printf("%s: VA API version: %d.%d\n", name, major_version, minor_version);
+
   driver = vaQueryVendorString(va_dpy);
   printf("%s: Driver version: %s\n", name, driver ? driver : "<unknown>");
   vaTerminate(va_dpy);