g3dvl: Follow mesa naming conventions for src dirs.
authorYounes Manton <younes.m@gmail.com>
Mon, 12 Jan 2009 18:19:07 +0000 (13:19 -0500)
committerYounes Manton <younes.m@gmail.com>
Mon, 19 Jan 2009 02:40:10 +0000 (21:40 -0500)
30 files changed:
src/libXvMC/Makefile [deleted file]
src/libXvMC/attributes.c [deleted file]
src/libXvMC/block.c [deleted file]
src/libXvMC/context.c [deleted file]
src/libXvMC/subpicture.c [deleted file]
src/libXvMC/surface.c [deleted file]
src/libXvMC/tests/.gitignore [deleted file]
src/libXvMC/tests/Makefile [deleted file]
src/libXvMC/tests/test_blocks.c [deleted file]
src/libXvMC/tests/test_context.c [deleted file]
src/libXvMC/tests/test_rendering.c [deleted file]
src/libXvMC/tests/test_surface.c [deleted file]
src/libXvMC/tests/testlib.c [deleted file]
src/libXvMC/tests/testlib.h [deleted file]
src/libXvMC/tests/xvmc_bench.c [deleted file]
src/xvmc/Makefile [new file with mode: 0644]
src/xvmc/attributes.c [new file with mode: 0644]
src/xvmc/block.c [new file with mode: 0644]
src/xvmc/context.c [new file with mode: 0644]
src/xvmc/subpicture.c [new file with mode: 0644]
src/xvmc/surface.c [new file with mode: 0644]
src/xvmc/tests/.gitignore [new file with mode: 0644]
src/xvmc/tests/Makefile [new file with mode: 0644]
src/xvmc/tests/test_blocks.c [new file with mode: 0644]
src/xvmc/tests/test_context.c [new file with mode: 0644]
src/xvmc/tests/test_rendering.c [new file with mode: 0644]
src/xvmc/tests/test_surface.c [new file with mode: 0644]
src/xvmc/tests/testlib.c [new file with mode: 0644]
src/xvmc/tests/testlib.h [new file with mode: 0644]
src/xvmc/tests/xvmc_bench.c [new file with mode: 0644]

diff --git a/src/libXvMC/Makefile b/src/libXvMC/Makefile
deleted file mode 100644 (file)
index 7badcfd..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-TARGET         = libXvMCg3dvl.so
-SONAME         = libXvMCg3dvl.so.1
-GALLIUMDIR     = ../gallium
-
-OBJECTS         = block.o surface.o context.o subpicture.o attributes.o
-
-ifeq (${DRIVER}, softpipe)
-OBJECTS         += ${GALLIUMDIR}/winsys/g3dvl/xsp_winsys.o
-endif
-
-CFLAGS += -g -fPIC -Wall -Werror=implicit-function-declaration \
-          -I${GALLIUMDIR}/state_trackers/g3dvl         \
-          -I${GALLIUMDIR}/winsys/g3dvl                 \
-          -I${GALLIUMDIR}/include                      \
-          -I${GALLIUMDIR}/auxiliary                    \
-          -I${GALLIUMDIR}/drivers
-
-ifeq (${DRIVER}, softpipe)
-LDFLAGS        += -L${GALLIUMDIR}/state_trackers/g3dvl         \
-          -L${GALLIUMDIR}/drivers/softpipe             \
-          -L${GALLIUMDIR}/auxiliary/tgsi               \
-          -L${GALLIUMDIR}/auxiliary/draw               \
-          -L${GALLIUMDIR}/auxiliary/translate          \
-          -L${GALLIUMDIR}/auxiliary/cso_cache          \
-          -L${GALLIUMDIR}/auxiliary/util               \
-          -L${GALLIUMDIR}/auxiliary/rtasm
-else
-LDFLAGS        += -L${GALLIUMDIR}/state_trackers/g3dvl         \
-          -L${GALLIUMDIR}/winsys/g3dvl/nouveau         \
-          -L${GALLIUMDIR}/auxiliary/util
-endif
-
-ifeq (${DRIVER}, softpipe)
-LIBS   += -lg3dvl -lsoftpipe -ldraw -ltgsi -ltranslate -lrtasm -lcso_cache -lutil -lm
-else
-LIBS   += -lg3dvl -lnouveau_dri -lutil
-endif
-
-#############################################
-
-ifeq (${DRIVER}, softpipe)
-.PHONY = all clean g3dvl
-else
-.PHONY = all clean g3dvl nouveau_winsys
-endif
-
-all: ${TARGET}
-
-ifeq (${DRIVER}, softpipe)
-${TARGET}: ${OBJECTS} g3dvl
-       $(CC) ${LDFLAGS} -shared -Wl,-soname,${SONAME} -o $@ ${OBJECTS} ${LIBS}
-
-g3dvl:
-       cd ${GALLIUMDIR}/state_trackers/g3dvl; ${MAKE}
-
-clean:
-       cd ${GALLIUMDIR}/state_trackers/g3dvl; ${MAKE} clean
-       rm -rf ${OBJECTS} ${TARGET}
-else
-${TARGET}: ${OBJECTS} g3dvl nouveau_winsys
-       $(CC) ${LDFLAGS} -shared -Wl,-soname,${SONAME} -o $@ ${OBJECTS} ${LIBS}
-
-g3dvl:
-       cd ${GALLIUMDIR}/state_trackers/g3dvl; ${MAKE}
-
-nouveau_winsys:
-       cd ${GALLIUMDIR}/winsys/g3dvl/nouveau; ${MAKE}
-
-clean:
-       cd ${GALLIUMDIR}/state_trackers/g3dvl; ${MAKE} clean
-       cd ${GALLIUMDIR}/winsys/g3dvl/nouveau; ${MAKE} clean
-       rm -rf ${OBJECTS} ${TARGET}
-endif
diff --git a/src/libXvMC/attributes.c b/src/libXvMC/attributes.c
deleted file mode 100644 (file)
index 674524b..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <assert.h>
-#include <X11/Xlib.h>
-#include <X11/extensions/Xvlib.h>
-#include <X11/extensions/XvMC.h>
-
-XvAttribute* XvMCQueryAttributes(Display *display, XvMCContext *context, int *number)
-{
-       return NULL;
-}
-
-Status XvMCSetAttribute(Display *display, XvMCContext *context, Atom attribute, int value)
-{
-       return BadImplementation;
-}
-
-Status XvMCGetAttribute(Display *display, XvMCContext *context, Atom attribute, int *value)
-{
-       return BadImplementation;
-}
-
diff --git a/src/libXvMC/block.c b/src/libXvMC/block.c
deleted file mode 100644 (file)
index b38a89b..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-#include <assert.h>
-#include <X11/Xlib.h>
-#include <X11/extensions/XvMC.h>
-#include <util/u_memory.h>
-#include <vl_display.h>
-#include <vl_screen.h>
-#include <vl_context.h>
-
-#define BLOCK_SIZE (64 * 2)
-
-Status XvMCCreateBlocks(Display *display, XvMCContext *context, unsigned int num_blocks, XvMCBlockArray *blocks)
-{
-       struct vlContext *vl_ctx;
-
-       assert(display);
-
-       if (!context)
-               return XvMCBadContext;
-       if (num_blocks == 0)
-               return BadValue;
-
-       assert(blocks);
-
-       vl_ctx = context->privData;
-       assert(display == vlGetNativeDisplay(vlGetDisplay(vlContextGetScreen(vl_ctx))));
-
-       blocks->context_id = context->context_id;
-       blocks->num_blocks = num_blocks;
-       blocks->blocks = MALLOC(BLOCK_SIZE * num_blocks);
-       /* Since we don't have a VL type for blocks, set privData to the display so we can catch mismatches */
-       blocks->privData = display;
-
-       return Success;
-}
-
-Status XvMCDestroyBlocks(Display *display, XvMCBlockArray *blocks)
-{
-       assert(display);
-       assert(blocks);
-       assert(display == blocks->privData);
-       FREE(blocks->blocks);
-
-       return Success;
-}
-
-Status XvMCCreateMacroBlocks(Display *display, XvMCContext *context, unsigned int num_blocks, XvMCMacroBlockArray *blocks)
-{
-       struct vlContext *vl_ctx;
-
-       assert(display);
-
-       if (!context)
-               return XvMCBadContext;
-       if (num_blocks == 0)
-               return BadValue;
-
-       assert(blocks);
-
-       vl_ctx = context->privData;
-       assert(display == vlGetNativeDisplay(vlGetDisplay(vlContextGetScreen(vl_ctx))));
-
-       blocks->context_id = context->context_id;
-       blocks->num_blocks = num_blocks;
-       blocks->macro_blocks = MALLOC(sizeof(XvMCMacroBlock) * num_blocks);
-       /* Since we don't have a VL type for blocks, set privData to the display so we can catch mismatches */
-       blocks->privData = display;
-
-       return Success;
-}
-
-Status XvMCDestroyMacroBlocks(Display *display, XvMCMacroBlockArray *blocks)
-{
-       assert(display);
-       assert(blocks);
-       assert(display == blocks->privData);
-       FREE(blocks->macro_blocks);
-
-       return Success;
-}
diff --git a/src/libXvMC/context.c b/src/libXvMC/context.c
deleted file mode 100644 (file)
index 273f658..0000000
+++ /dev/null
@@ -1,207 +0,0 @@
-#include <assert.h>
-#include <X11/Xlib.h>
-#include <X11/extensions/XvMClib.h>
-#include <pipe/p_context.h>
-#include <vl_display.h>
-#include <vl_screen.h>
-#include <vl_context.h>
-#include <vl_winsys.h>
-
-static Status Validate
-(
-       Display *display,
-       XvPortID port,
-       int surface_type_id,
-       unsigned int width,
-       unsigned int height,
-       int flags,
-       int *found_port,
-       int *chroma_format,
-       int *mc_type
-)
-{
-       unsigned int    found_surface = 0;
-       XvAdaptorInfo   *adaptor_info;
-       unsigned int    num_adaptors;
-       int             num_types;
-       unsigned int    max_width, max_height;
-       Status          ret;
-       unsigned int    i, j, k;
-
-       assert(display && chroma_format);
-
-       *found_port = 0;
-
-       ret = XvQueryAdaptors(display, XDefaultRootWindow(display), &num_adaptors, &adaptor_info);
-       if (ret != Success)
-               return ret;
-
-       /* Scan through all adaptors looking for this port and surface */
-       for (i = 0; i < num_adaptors && !*found_port; ++i)
-       {
-               /* Scan through all ports of this adaptor looking for our port */
-               for (j = 0; j < adaptor_info[i].num_ports && !*found_port; ++j)
-               {
-                       /* If this is our port, scan through all its surfaces looking for our surface */
-                       if (adaptor_info[i].base_id + j == port)
-                       {
-                               XvMCSurfaceInfo *surface_info;
-
-                               *found_port = 1;
-                               surface_info = XvMCListSurfaceTypes(display, adaptor_info[i].base_id, &num_types);
-
-                               if (surface_info)
-                               {
-                                       for (k = 0; k < num_types && !found_surface; ++k)
-                                       {
-                                               if (surface_info[k].surface_type_id == surface_type_id)
-                                               {
-                                                       found_surface = 1;
-                                                       max_width = surface_info[k].max_width;
-                                                       max_height = surface_info[k].max_height;
-                                                       *chroma_format = surface_info[k].chroma_format;
-                                                       *mc_type = surface_info[k].mc_type;
-                                               }
-                                       }
-
-                                       XFree(surface_info);
-                               }
-                               else
-                               {
-                                       XvFreeAdaptorInfo(adaptor_info);
-                                       return BadAlloc;
-                               }
-                       }
-               }
-       }
-
-       XvFreeAdaptorInfo(adaptor_info);
-
-       if (!*found_port)
-               return XvBadPort;
-       if (!found_surface)
-               return BadMatch;
-       if (width > max_width || height > max_height)
-               return BadValue;
-       if (flags != XVMC_DIRECT && flags != 0)
-               return BadValue;
-
-       return Success;
-}
-
-static enum vlProfile ProfileToVL(int xvmc_profile)
-{
-       if (xvmc_profile & XVMC_MPEG_1)
-               assert(0);
-       else if (xvmc_profile & XVMC_MPEG_2)
-               return vlProfileMpeg2Main;
-       else if (xvmc_profile & XVMC_H263)
-               assert(0);
-       else if (xvmc_profile & XVMC_MPEG_4)
-               assert(0);
-       else
-               assert(0);
-
-       return -1;
-}
-
-static enum vlEntryPoint EntryToVL(int xvmc_entry)
-{
-       return xvmc_entry & XVMC_IDCT ? vlEntryPointIDCT : vlEntryPointMC;
-}
-
-static enum vlFormat FormatToVL(int xvmc_format)
-{
-       switch (xvmc_format)
-       {
-               case XVMC_CHROMA_FORMAT_420:
-                       return vlFormatYCbCr420;
-               case XVMC_CHROMA_FORMAT_422:
-                       return vlFormatYCbCr422;
-               case XVMC_CHROMA_FORMAT_444:
-                       return vlFormatYCbCr444;
-               default:
-                       assert(0);
-       }
-
-       return -1;
-}
-
-Status XvMCCreateContext(Display *display, XvPortID port, int surface_type_id, int width, int height, int flags, XvMCContext *context)
-{
-       int                     found_port;
-       int                     chroma_format;
-       int                     mc_type;
-       Status                  ret;
-       struct vlDisplay        *vl_dpy;
-       struct vlScreen         *vl_scrn;
-       struct vlContext        *vl_ctx;
-       struct pipe_context     *pipe;
-
-       assert(display);
-
-       if (!context)
-               return XvMCBadContext;
-
-       ret = Validate(display, port, surface_type_id, width, height, flags, &found_port, &chroma_format, &mc_type);
-
-       /* XXX: Success and XvBadPort have the same value */
-       if (ret != Success || !found_port)
-               return ret;
-
-       /* XXX: Assumes default screen, should check which screen port is on */
-       pipe = create_pipe_context(display, XDefaultScreen(display));
-
-       assert(pipe);
-
-       vlCreateDisplay(display, &vl_dpy);
-       vlCreateScreen(vl_dpy, XDefaultScreen(display), pipe->screen, &vl_scrn);
-       vlCreateContext
-       (
-               vl_scrn,
-               pipe,
-               width,
-               height,
-               FormatToVL(chroma_format),
-               ProfileToVL(mc_type),
-               EntryToVL(mc_type),
-               &vl_ctx
-       );
-
-       context->context_id = XAllocID(display);
-       context->surface_type_id = surface_type_id;
-       context->width = width;
-       context->height = height;
-       context->flags = flags;
-       context->port = port;
-       context->privData = vl_ctx;
-
-       return Success;
-}
-
-Status XvMCDestroyContext(Display *display, XvMCContext *context)
-{
-       struct vlContext        *vl_ctx;
-       struct vlScreen         *vl_screen;
-       struct vlDisplay        *vl_dpy;
-       struct pipe_context     *pipe;
-
-       assert(display);
-
-       if (!context)
-               return XvMCBadContext;
-
-       vl_ctx = context->privData;
-
-       assert(display == vlGetNativeDisplay(vlGetDisplay(vlContextGetScreen(vl_ctx))));
-
-       pipe = vlGetPipeContext(vl_ctx);
-       vl_screen = vlContextGetScreen(vl_ctx);
-       vl_dpy = vlGetDisplay(vl_screen);
-       vlDestroyContext(vl_ctx);
-       vlDestroyScreen(vl_screen);
-       vlDestroyDisplay(vl_dpy);
-       destroy_pipe_context(pipe);
-
-       return Success;
-}
diff --git a/src/libXvMC/subpicture.c b/src/libXvMC/subpicture.c
deleted file mode 100644 (file)
index c8f70c9..0000000
+++ /dev/null
@@ -1,215 +0,0 @@
-#include <assert.h>
-#include <X11/Xlib.h>
-#include <X11/extensions/Xvlib.h>
-#include <X11/extensions/XvMC.h>
-
-Status XvMCCreateSubpicture
-(
-       Display *display,
-       XvMCContext *context,
-       XvMCSubpicture *subpicture,
-       unsigned short width,
-       unsigned short height,
-       int xvimage_id
-)
-{
-       assert(display);
-       
-       if (!context)
-               return XvMCBadContext;
-       
-       assert(subpicture);
-       
-       if (width > 2048 || height > 2048)
-               return BadValue;
-       
-       if (xvimage_id != 123)
-               return BadMatch;
-       
-       subpicture->subpicture_id = XAllocID(display);
-       subpicture->context_id = context->context_id;
-       subpicture->xvimage_id = xvimage_id;
-       subpicture->width = width;
-       subpicture->height = height;
-       subpicture->num_palette_entries = 0;
-       subpicture->entry_bytes = 0;
-       subpicture->component_order[0] = 0;
-       subpicture->component_order[1] = 0;
-       subpicture->component_order[2] = 0;
-       subpicture->component_order[3] = 0;
-       /* TODO: subpicture->privData = ;*/
-       
-       return Success;
-}
-
-Status XvMCClearSubpicture
-(
-       Display *display,
-       XvMCSubpicture *subpicture,
-       short x,
-       short y,
-       unsigned short width,
-       unsigned short height,
-       unsigned int color
-)
-{
-       assert(display);
-       
-       if (!subpicture)
-               return XvMCBadSubpicture;
-       
-       /* TODO: Assert clear rect is within bounds? Or clip? */
-       
-       return Success;
-}
-
-Status XvMCCompositeSubpicture
-(
-       Display *display,
-       XvMCSubpicture *subpicture,
-       XvImage *image,
-       short srcx,
-       short srcy,
-       unsigned short width,
-       unsigned short height,
-       short dstx,
-       short dsty
-)
-{
-       assert(display);
-       
-       if (!subpicture)
-               return XvMCBadSubpicture;
-       
-       assert(image);
-       
-       if (subpicture->xvimage_id != image->id)
-               return BadMatch;
-       
-       /* TODO: Assert rects are within bounds? Or clip? */
-       
-       return Success;
-}
-
-Status XvMCDestroySubpicture(Display *display, XvMCSubpicture *subpicture)
-{
-       assert(display);
-       
-       if (!subpicture)
-               return XvMCBadSubpicture;
-       
-       return BadImplementation;
-}
-
-Status XvMCSetSubpicturePalette(Display *display, XvMCSubpicture *subpicture, unsigned char *palette)
-{
-       assert(display);
-       
-       if (!subpicture)
-               return XvMCBadSubpicture;
-       
-       assert(palette);
-       
-       /* We don't support paletted subpictures */
-       return BadMatch;
-}
-
-Status XvMCBlendSubpicture
-(
-       Display *display,
-       XvMCSurface *target_surface,
-       XvMCSubpicture *subpicture,
-       short subx,
-       short suby,
-       unsigned short subw,
-       unsigned short subh,
-       short surfx,
-       short surfy,
-       unsigned short surfw,
-       unsigned short surfh
-)
-{
-       assert(display);
-       
-       if (!target_surface)
-               return XvMCBadSurface;
-       
-       if (!subpicture)
-               return XvMCBadSubpicture;
-       
-       if (target_surface->context_id != subpicture->context_id)
-               return BadMatch;
-       
-       /* TODO: Assert rects are within bounds? Or clip? */
-       return Success;
-}
-
-Status XvMCBlendSubpicture2
-(
-       Display *display,
-       XvMCSurface *source_surface,
-       XvMCSurface *target_surface,
-       XvMCSubpicture *subpicture,
-       short subx,
-       short suby,
-       unsigned short subw,
-       unsigned short subh,
-       short surfx,
-       short surfy,
-       unsigned short surfw,
-       unsigned short surfh
-)
-{
-       assert(display);
-       
-       if (!source_surface || !target_surface)
-               return XvMCBadSurface;
-       
-       if (!subpicture)
-               return XvMCBadSubpicture;
-       
-       if (source_surface->context_id != subpicture->context_id)
-               return BadMatch;
-               
-       if (source_surface->context_id != subpicture->context_id)
-               return BadMatch;
-       
-       /* TODO: Assert rects are within bounds? Or clip? */
-       return Success;
-}
-
-Status XvMCSyncSubpicture(Display *display, XvMCSubpicture *subpicture)
-{
-       assert(display);
-       
-       if (!subpicture)
-               return XvMCBadSubpicture;
-       
-       return Success;
-}
-
-Status XvMCFlushSubpicture(Display *display, XvMCSubpicture *subpicture)
-{
-       assert(display);
-       
-       if (!subpicture)
-               return XvMCBadSubpicture;
-       
-       return Success;
-}
-
-Status XvMCGetSubpictureStatus(Display *display, XvMCSubpicture *subpicture, int *status)
-{
-       assert(display);
-       
-       if (!subpicture)
-               return XvMCBadSubpicture;
-       
-       assert(status);
-       
-       /* TODO */
-       *status = 0;
-       
-       return Success;
-}
-
diff --git a/src/libXvMC/surface.c b/src/libXvMC/surface.c
deleted file mode 100644 (file)
index 67c179e..0000000
+++ /dev/null
@@ -1,356 +0,0 @@
-#include <assert.h>
-#include <X11/Xlib.h>
-#include <X11/extensions/XvMC.h>
-#include <vl_display.h>
-#include <vl_screen.h>
-#include <vl_context.h>
-#include <vl_surface.h>
-#include <vl_types.h>
-
-static enum vlMacroBlockType TypeToVL(int xvmc_mb_type)
-{
-       if (xvmc_mb_type & XVMC_MB_TYPE_INTRA)
-               return vlMacroBlockTypeIntra;
-       if ((xvmc_mb_type & (XVMC_MB_TYPE_MOTION_FORWARD | XVMC_MB_TYPE_MOTION_BACKWARD)) == XVMC_MB_TYPE_MOTION_FORWARD)
-               return vlMacroBlockTypeFwdPredicted;
-       if ((xvmc_mb_type & (XVMC_MB_TYPE_MOTION_FORWARD | XVMC_MB_TYPE_MOTION_BACKWARD)) == XVMC_MB_TYPE_MOTION_BACKWARD)
-               return vlMacroBlockTypeBkwdPredicted;
-       if ((xvmc_mb_type & (XVMC_MB_TYPE_MOTION_FORWARD | XVMC_MB_TYPE_MOTION_BACKWARD)) == (XVMC_MB_TYPE_MOTION_FORWARD | XVMC_MB_TYPE_MOTION_BACKWARD))
-               return vlMacroBlockTypeBiPredicted;
-
-       assert(0);
-
-       return -1;
-}
-
-static enum vlPictureType PictureToVL(int xvmc_pic)
-{
-       switch (xvmc_pic)
-       {
-               case XVMC_TOP_FIELD:
-                       return vlPictureTypeTopField;
-               case XVMC_BOTTOM_FIELD:
-                       return vlPictureTypeBottomField;
-               case XVMC_FRAME_PICTURE:
-                       return vlPictureTypeFrame;
-               default:
-                       assert(0);
-       }
-
-       return -1;
-}
-
-static enum vlMotionType MotionToVL(int xvmc_motion_type, int xvmc_dct_type)
-{
-       switch (xvmc_motion_type)
-       {
-               case XVMC_PREDICTION_FRAME:
-                       return xvmc_dct_type == XVMC_DCT_TYPE_FIELD ? vlMotionType16x8 : vlMotionTypeFrame;
-               case XVMC_PREDICTION_FIELD:
-                       return vlMotionTypeField;
-               case XVMC_PREDICTION_DUAL_PRIME:
-                       return vlMotionTypeDualPrime;
-               default:
-                       assert(0);
-       }
-
-       return -1;
-}
-
-Status XvMCCreateSurface(Display *display, XvMCContext *context, XvMCSurface *surface)
-{
-       struct vlContext *vl_ctx;
-       struct vlSurface *vl_sfc;
-
-       assert(display);
-
-       if (!context)
-               return XvMCBadContext;
-       if (!surface)
-               return XvMCBadSurface;
-
-       vl_ctx = context->privData;
-
-       assert(display == vlGetNativeDisplay(vlGetDisplay(vlContextGetScreen(vl_ctx))));
-
-       vlCreateSurface
-       (
-               vlContextGetScreen(vl_ctx),
-               context->width,
-               context->height,
-               vlGetPictureFormat(vl_ctx),
-               &vl_sfc
-       );
-
-       vlBindToContext(vl_sfc, vl_ctx);
-
-       surface->surface_id = XAllocID(display);
-       surface->context_id = context->context_id;
-       surface->surface_type_id = context->surface_type_id;
-       surface->width = context->width;
-       surface->height = context->height;
-       surface->privData = vl_sfc;
-
-       return Success;
-}
-
-Status XvMCRenderSurface
-(
-       Display *display,
-       XvMCContext *context,
-       unsigned int picture_structure,
-       XvMCSurface *target_surface,
-       XvMCSurface *past_surface,
-       XvMCSurface *future_surface,
-       unsigned int flags,
-       unsigned int num_macroblocks,
-       unsigned int first_macroblock,
-       XvMCMacroBlockArray *macroblocks,
-       XvMCBlockArray *blocks
-)
-{
-       struct vlContext                *vl_ctx;
-       struct vlSurface                *target_vl_surface;
-       struct vlSurface                *past_vl_surface;
-       struct vlSurface                *future_vl_surface;
-       struct vlMpeg2MacroBlockBatch   batch;
-       struct vlMpeg2MacroBlock        vl_macroblocks[num_macroblocks];
-       unsigned int                    i;
-
-       assert(display);
-
-       if (!context)
-               return XvMCBadContext;
-       if (!target_surface)
-               return XvMCBadSurface;
-
-       if
-       (
-               picture_structure != XVMC_TOP_FIELD &&
-               picture_structure != XVMC_BOTTOM_FIELD &&
-               picture_structure != XVMC_FRAME_PICTURE
-       )
-               return BadValue;
-       if (future_surface && !past_surface)
-               return BadMatch;
-
-       vl_ctx = context->privData;
-
-       assert(display == vlGetNativeDisplay(vlGetDisplay(vlContextGetScreen(vl_ctx))));
-
-       target_vl_surface = target_surface->privData;
-       past_vl_surface = past_surface ? past_surface->privData : NULL;
-       future_vl_surface = future_surface ? future_surface->privData : NULL;
-
-       assert(context->context_id == target_surface->context_id);
-       assert(!past_surface || context->context_id == past_surface->context_id);
-       assert(!future_surface || context->context_id == future_surface->context_id);
-
-       assert(macroblocks);
-       assert(blocks);
-
-       assert(macroblocks->context_id == context->context_id);
-       assert(blocks->context_id == context->context_id);
-
-       assert(flags == 0 || flags == XVMC_SECOND_FIELD);
-
-       batch.past_surface = past_vl_surface;
-       batch.future_surface = future_vl_surface;
-       batch.picture_type = PictureToVL(picture_structure);
-       batch.field_order = flags & XVMC_SECOND_FIELD ? vlFieldOrderSecond : vlFieldOrderFirst;
-       batch.num_macroblocks = num_macroblocks;
-       batch.macroblocks = vl_macroblocks;
-
-       for (i = 0; i < num_macroblocks; ++i)
-       {
-               unsigned int j = first_macroblock + i;
-
-               unsigned int k, l, m;
-
-               batch.macroblocks[i].mbx = macroblocks->macro_blocks[j].x;
-               batch.macroblocks[i].mby = macroblocks->macro_blocks[j].y;
-               batch.macroblocks[i].mb_type = TypeToVL(macroblocks->macro_blocks[j].macroblock_type);
-               if (batch.macroblocks[i].mb_type != vlMacroBlockTypeIntra)
-                       batch.macroblocks[i].mo_type = MotionToVL(macroblocks->macro_blocks[j].motion_type, macroblocks->macro_blocks[j].dct_type);
-               batch.macroblocks[i].dct_type = macroblocks->macro_blocks[j].dct_type == XVMC_DCT_TYPE_FIELD ? vlDCTTypeFieldCoded : vlDCTTypeFrameCoded;
-
-               for (k = 0; k < 2; ++k)
-                       for (l = 0; l < 2; ++l)
-                               for (m = 0; m < 2; ++m)
-                                       batch.macroblocks[i].PMV[k][l][m] = macroblocks->macro_blocks[j].PMV[k][l][m];
-
-               batch.macroblocks[i].cbp = macroblocks->macro_blocks[j].coded_block_pattern;
-               batch.macroblocks[i].blocks = blocks->blocks + (macroblocks->macro_blocks[j].index * 64);
-       }
-
-       vlRenderMacroBlocksMpeg2(&batch, target_vl_surface);
-
-       return Success;
-}
-
-Status XvMCFlushSurface(Display *display, XvMCSurface *surface)
-{
-       struct vlSurface *vl_sfc;
-
-       assert(display);
-
-       if (!surface)
-               return XvMCBadSurface;
-
-       vl_sfc = surface->privData;
-
-       assert(display == vlGetNativeDisplay(vlGetDisplay(vlSurfaceGetScreen(vl_sfc))));
-
-       vlSurfaceFlush(vl_sfc);
-
-       return Success;
-}
-
-Status XvMCSyncSurface(Display *display, XvMCSurface *surface)
-{
-       struct vlSurface *vl_sfc;
-
-       assert(display);
-
-       if (!surface)
-               return XvMCBadSurface;
-
-       vl_sfc = surface->privData;
-
-       assert(display == vlGetNativeDisplay(vlGetDisplay(vlSurfaceGetScreen(vl_sfc))));
-
-       vlSurfaceSync(vl_sfc);
-
-       return Success;
-}
-
-Status XvMCPutSurface
-(
-       Display *display,
-       XvMCSurface *surface,
-       Drawable drawable,
-       short srcx,
-       short srcy,
-       unsigned short srcw,
-       unsigned short srch,
-       short destx,
-       short desty,
-       unsigned short destw,
-       unsigned short desth,
-       int flags
-)
-{
-       Window                  root;
-       int                     x, y;
-       unsigned int            width, height;
-       unsigned int            border_width;
-       unsigned int            depth;
-       struct vlSurface        *vl_sfc;
-
-       assert(display);
-
-       if (!surface)
-               return XvMCBadSurface;
-
-       if (XGetGeometry(display, drawable, &root, &x, &y, &width, &height, &border_width, &depth) == BadDrawable)
-               return BadDrawable;
-
-       assert(flags == XVMC_TOP_FIELD || flags == XVMC_BOTTOM_FIELD || flags == XVMC_FRAME_PICTURE);
-
-       /* TODO: Correct for negative srcx,srcy & destx,desty by clipping */
-
-       assert(srcx + srcw - 1 < surface->width);
-       assert(srcy + srch - 1 < surface->height);
-       /* XXX: Some apps (mplayer) hit these asserts because they call
-        * this function after the window has been resized by the WM
-        * but before they've handled the corresponding XEvent and
-        * know about the new dimensions. The output will be clipped
-        * for a few frames until the app updates destw and desth.
-        */
-       /*assert(destx + destw - 1 < width);
-       assert(desty + desth - 1 < height);*/
-
-       vl_sfc = surface->privData;
-
-       vlPutPicture(vl_sfc, drawable, srcx, srcy, srcw, srch, destx, desty, destw, desth, width, height, PictureToVL(flags));
-
-       return Success;
-}
-
-Status XvMCGetSurfaceStatus(Display *display, XvMCSurface *surface, int *status)
-{
-       struct vlSurface        *vl_sfc;
-       enum vlResourceStatus   res_status;
-
-       assert(display);
-
-       if (!surface)
-               return XvMCBadSurface;
-
-       assert(status);
-
-       vl_sfc = surface->privData;
-
-       assert(display == vlGetNativeDisplay(vlGetDisplay(vlSurfaceGetScreen(vl_sfc))));
-
-       vlSurfaceGetStatus(vl_sfc, &res_status);
-
-       switch (res_status)
-       {
-               case vlResourceStatusFree:
-               {
-                       *status = 0;
-                       break;
-               }
-               case vlResourceStatusRendering:
-               {
-                       *status = XVMC_RENDERING;
-                       break;
-               }
-               case vlResourceStatusDisplaying:
-               {
-                       *status = XVMC_DISPLAYING;
-                       break;
-               }
-               default:
-                       assert(0);
-       }
-
-       return Success;
-}
-
-Status XvMCDestroySurface(Display *display, XvMCSurface *surface)
-{
-       struct vlSurface *vl_sfc;
-
-       assert(display);
-
-       if (!surface)
-               return XvMCBadSurface;
-
-       vl_sfc = surface->privData;
-
-       assert(display == vlGetNativeDisplay(vlGetDisplay(vlSurfaceGetScreen(vl_sfc))));
-
-       vlDestroySurface(vl_sfc);
-
-       return Success;
-}
-
-Status XvMCHideSurface(Display *display, XvMCSurface *surface)
-{
-       struct vlSurface *vl_sfc;
-
-       assert(display);
-
-       if (!surface)
-               return XvMCBadSurface;
-
-       vl_sfc = surface->privData;
-
-       assert(display == vlGetNativeDisplay(vlGetDisplay(vlSurfaceGetScreen(vl_sfc))));
-
-       /* No op, only for overlaid rendering */
-
-       return Success;
-}
diff --git a/src/libXvMC/tests/.gitignore b/src/libXvMC/tests/.gitignore
deleted file mode 100644 (file)
index e1d2f90..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-test_context
-test_surface
-test_blocks
-test_rendering
-xvmc_bench
diff --git a/src/libXvMC/tests/Makefile b/src/libXvMC/tests/Makefile
deleted file mode 100644 (file)
index de09516..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-CFLAGS += -g -Wall
-LDFLAGS        +=
-LIBS   += -lXvMCW -lXvMC -lXv
-
-#############################################
-
-.PHONY = all clean
-
-all: test_context test_surface test_blocks test_rendering xvmc_bench
-
-test_context: test_context.o testlib.o
-       $(CC) ${LDFLAGS} -o $@ $^ ${LIBS}
-
-test_surface: test_surface.o testlib.o
-       $(CC) ${LDFLAGS} -o $@ $^ ${LIBS}
-
-test_blocks: test_blocks.o testlib.o
-       $(CC) ${LDFLAGS} -o $@ $^ ${LIBS}
-
-test_rendering: test_rendering.o testlib.o
-       $(CC) ${LDFLAGS} -o $@ $^ ${LIBS}
-
-xvmc_bench: xvmc_bench.o testlib.o
-       $(CC) ${LDFLAGS} -o $@ $^ ${LIBS}
-
-clean:
-       rm -rf *.o test_context test_surface test_blocks test_rendering xvmc_bench
diff --git a/src/libXvMC/tests/test_blocks.c b/src/libXvMC/tests/test_blocks.c
deleted file mode 100644 (file)
index dc80adf..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-#include <assert.h>
-#include <error.h>
-#include "testlib.h"
-
-int main(int argc, char **argv)
-{
-       const unsigned int      width = 16, height = 16;
-       const unsigned int      min_required_blocks = 1, min_required_macroblocks = 1;
-       const unsigned int      mc_types[2] = {XVMC_MOCOMP | XVMC_MPEG_2, XVMC_IDCT | XVMC_MPEG_2};
-
-       Display                 *display;
-       XvPortID                port_num;
-       int                     surface_type_id;
-       unsigned int            is_overlay, intra_unsigned;
-       int                     colorkey;
-       XvMCContext             context;
-       XvMCSurface             surface;
-       XvMCBlockArray          blocks = {0};
-       XvMCMacroBlockArray     macroblocks = {0};
-
-       display = XOpenDisplay(NULL);
-
-       if (!GetPort
-       (
-               display,
-               width,
-               height,
-               XVMC_CHROMA_FORMAT_420,
-               mc_types,
-               2,
-               &port_num,
-               &surface_type_id,
-               &is_overlay,
-               &intra_unsigned
-       ))
-       {
-               XCloseDisplay(display);
-               error(1, 0, "Error, unable to find a good port.\n");
-       }
-
-       if (is_overlay)
-       {
-               Atom xv_colorkey = XInternAtom(display, "XV_COLORKEY", 0);
-               XvGetPortAttribute(display, port_num, xv_colorkey, &colorkey);
-       }
-
-       assert(XvMCCreateContext(display, port_num, surface_type_id, width, height, XVMC_DIRECT, &context) == Success);
-       assert(XvMCCreateSurface(display, &context, &surface) == Success);
-
-       /* Test NULL context */
-       assert(XvMCCreateBlocks(display, NULL, 1, &blocks) == XvMCBadContext);
-       /* Test 0 blocks */
-       assert(XvMCCreateBlocks(display, &context, 0, &blocks) == BadValue);
-       /* Test valid params */
-       assert(XvMCCreateBlocks(display, &context, min_required_blocks, &blocks) == Success);
-       /* Test context id assigned and correct */
-       assert(blocks.context_id == context.context_id);
-       /* Test number of blocks assigned and correct */
-       assert(blocks.num_blocks == min_required_blocks);
-       /* Test block pointer valid */
-       assert(blocks.blocks != NULL);
-       /* Test NULL context */
-       assert(XvMCCreateMacroBlocks(display, NULL, 1, &macroblocks) == XvMCBadContext);
-       /* Test 0 macroblocks */
-       assert(XvMCCreateMacroBlocks(display, &context, 0, &macroblocks) == BadValue);
-       /* Test valid params */
-       assert(XvMCCreateMacroBlocks(display, &context, min_required_macroblocks, &macroblocks) == Success);
-       /* Test context id assigned and correct */
-       assert(macroblocks.context_id == context.context_id);
-       /* Test macroblock pointer valid */
-       assert(macroblocks.macro_blocks != NULL);
-       /* Test valid params */
-       assert(XvMCDestroyMacroBlocks(display, &macroblocks) == Success);
-       /* Test valid params */
-       assert(XvMCDestroyBlocks(display, &blocks) == Success);
-
-       assert(XvMCDestroySurface(display, &surface) == Success);
-       assert(XvMCDestroyContext(display, &context) == Success);
-
-       XvUngrabPort(display, port_num, CurrentTime);
-       XCloseDisplay(display);
-
-       return 0;
-}
diff --git a/src/libXvMC/tests/test_context.c b/src/libXvMC/tests/test_context.c
deleted file mode 100644 (file)
index 53f7449..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-#include <assert.h>
-#include <error.h>
-#include "testlib.h"
-
-int main(int argc, char **argv)
-{
-       const unsigned int      width = 16, height = 16;
-       const unsigned int      mc_types[2] = {XVMC_MOCOMP | XVMC_MPEG_2, XVMC_IDCT | XVMC_MPEG_2};
-
-       Display                 *display;
-       XvPortID                port_num;
-       int                     surface_type_id;
-       unsigned int            is_overlay, intra_unsigned;
-       int                     colorkey;
-       XvMCContext             context = {0};
-
-       display = XOpenDisplay(NULL);
-
-       if (!GetPort
-       (
-               display,
-               width,
-               height,
-               XVMC_CHROMA_FORMAT_420,
-               mc_types,
-               2,
-               &port_num,
-               &surface_type_id,
-               &is_overlay,
-               &intra_unsigned
-       ))
-       {
-               XCloseDisplay(display);
-               error(1, 0, "Error, unable to find a good port.\n");
-       }
-
-       if (is_overlay)
-       {
-               Atom xv_colorkey = XInternAtom(display, "XV_COLORKEY", 0);
-               XvGetPortAttribute(display, port_num, xv_colorkey, &colorkey);
-       }
-
-       /* Test NULL context */
-       /* XXX: XvMCBadContext not a valid return for XvMCCreateContext in the XvMC API, but openChrome driver returns it */
-       assert(XvMCCreateContext(display, port_num, surface_type_id, width, height, XVMC_DIRECT, NULL) == XvMCBadContext);
-       /* Test invalid port */
-       /* XXX: Success and XvBadPort have the same value, if this call actually gets passed the validation step as of now we'll crash later */
-       assert(XvMCCreateContext(display, -1, surface_type_id, width, height, XVMC_DIRECT, &context) == XvBadPort);
-       /* Test invalid surface */
-       assert(XvMCCreateContext(display, port_num, -1, width, height, XVMC_DIRECT, &context) == BadMatch);
-       /* Test invalid flags */
-       assert(XvMCCreateContext(display, port_num, surface_type_id, width, height, -1, &context) == BadValue);
-       /* Test huge width */
-       assert(XvMCCreateContext(display, port_num, surface_type_id, 16384, height, XVMC_DIRECT, &context) == BadValue);
-       /* Test huge height */
-       assert(XvMCCreateContext(display, port_num, surface_type_id, width, 16384, XVMC_DIRECT, &context) == BadValue);
-       /* Test huge width & height */
-       assert(XvMCCreateContext(display, port_num, surface_type_id, 16384, 16384, XVMC_DIRECT, &context) == BadValue);
-       /* Test valid params */
-       assert(XvMCCreateContext(display, port_num, surface_type_id, width, height, XVMC_DIRECT, &context) == Success);
-       /* Test context id assigned */
-       assert(context.context_id != 0);
-       /* Test surface type id assigned and correct */
-       assert(context.surface_type_id == surface_type_id);
-       /* Test width & height assigned and correct */
-       assert(context.width == width && context.height == height);
-       /* Test port assigned and correct */
-       assert(context.port == port_num);
-       /* Test flags assigned and correct */
-       assert(context.flags == XVMC_DIRECT);
-       /* Test NULL context */
-       assert(XvMCDestroyContext(display, NULL) == XvMCBadContext);
-       /* Test valid params */
-       assert(XvMCDestroyContext(display, &context) == Success);
-       /* Test awkward but valid width */
-       assert(XvMCCreateContext(display, port_num, surface_type_id, width + 1, height, XVMC_DIRECT, &context) == Success);
-       assert(context.width >= width + 1);
-       assert(XvMCDestroyContext(display, &context) == Success);
-       /* Test awkward but valid height */
-       assert(XvMCCreateContext(display, port_num, surface_type_id, width, height + 1, XVMC_DIRECT, &context) == Success);
-       assert(context.height >= height + 1);
-       assert(XvMCDestroyContext(display, &context) == Success);
-       /* Test awkward but valid width & height */
-       assert(XvMCCreateContext(display, port_num, surface_type_id, width + 1, height + 1, XVMC_DIRECT, &context) == Success);
-       assert(context.width >= width + 1 && context.height >= height + 1);
-       assert(XvMCDestroyContext(display, &context) == Success);
-
-       XvUngrabPort(display, port_num, CurrentTime);
-       XCloseDisplay(display);
-
-       return 0;
-}
diff --git a/src/libXvMC/tests/test_rendering.c b/src/libXvMC/tests/test_rendering.c
deleted file mode 100644 (file)
index 1e7467a..0000000
+++ /dev/null
@@ -1,287 +0,0 @@
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <error.h>
-#include "testlib.h"
-
-#define BLOCK_WIDTH                    8
-#define BLOCK_HEIGHT                   8
-#define BLOCK_SIZE                     (BLOCK_WIDTH * BLOCK_HEIGHT)
-#define MACROBLOCK_WIDTH               16
-#define MACROBLOCK_HEIGHT              16
-#define MACROBLOCK_WIDTH_IN_BLOCKS     (MACROBLOCK_WIDTH / BLOCK_WIDTH)
-#define MACROBLOCK_HEIGHT_IN_BLOCKS    (MACROBLOCK_HEIGHT / BLOCK_HEIGHT)
-#define BLOCKS_PER_MACROBLOCK          6
-
-#define INPUT_WIDTH                    16
-#define INPUT_HEIGHT                   16
-#define INPUT_WIDTH_IN_MACROBLOCKS     (INPUT_WIDTH / MACROBLOCK_WIDTH)
-#define INPUT_HEIGHT_IN_MACROBLOCKS    (INPUT_HEIGHT / MACROBLOCK_HEIGHT)
-#define NUM_MACROBLOCKS                        (INPUT_WIDTH_IN_MACROBLOCKS * INPUT_HEIGHT_IN_MACROBLOCKS)
-
-#define DEFAULT_OUTPUT_WIDTH           INPUT_WIDTH
-#define DEFAULT_OUTPUT_HEIGHT          INPUT_HEIGHT
-#define DEFAULT_ACCEPTABLE_ERR         0.01
-
-void ParseArgs(int argc, char **argv, unsigned int *output_width, unsigned int *output_height, double *acceptable_error, int *prompt)
-{
-       int fail = 0;
-       int i;
-
-       *output_width = DEFAULT_OUTPUT_WIDTH;
-       *output_height = DEFAULT_OUTPUT_WIDTH;
-       *acceptable_error = DEFAULT_ACCEPTABLE_ERR;
-       *prompt = 1;
-
-       for (i = 1; i < argc && !fail; ++i)
-       {
-               if (!strcmp(argv[i], "-w"))
-               {
-                       if (sscanf(argv[++i], "%u", output_width) != 1)
-                               fail = 1;
-               }
-               else if (!strcmp(argv[i], "-h"))
-               {
-                       if (sscanf(argv[++i], "%u", output_height) != 1)
-                               fail = 1;
-               }
-               else if (!strcmp(argv[i], "-e"))
-               {
-                       if (sscanf(argv[++i], "%lf", acceptable_error) != 1)
-                               fail = 1;
-               }
-               else if (strcmp(argv[i], "-n"))
-                       *prompt = 0;
-               else
-                       fail = 1;
-       }
-
-       if (fail)
-               error
-               (
-                       1, 0,
-                       "Bad argument.\n"
-                       "\n"
-                       "Usage: %s [options]\n"
-                       "\t-w <width>\tOutput width\n"
-                       "\t-h <height>\tOutput height\n"
-                       "\t-e <error>\tAcceptable margin of error per pixel, from 0 to 1\n"
-                       "\t-n\tDon't prompt for quit\n",
-                       argv[0]
-               );
-}
-
-void Gradient(short *block, unsigned int start, unsigned int stop, int horizontal)
-{
-       unsigned int x, y;
-       unsigned int range = stop - start;
-
-       if (horizontal)
-       {
-               for (y = 0; y < BLOCK_HEIGHT; ++y)
-                       for (x = 0; x < BLOCK_WIDTH; ++x)
-                               block[y * BLOCK_WIDTH + x] = (short)(start + range * (x / (float)(BLOCK_WIDTH - 1)));
-       }
-       else
-       {
-               for (y = 0; y < BLOCK_HEIGHT; ++y)
-                       for (x = 0; x < BLOCK_WIDTH; ++x)
-                               block[y * BLOCK_WIDTH + x] = (short)(start + range * (y / (float)(BLOCK_HEIGHT - 1)));
-       }
-}
-
-int main(int argc, char **argv)
-{
-       unsigned int            output_width;
-       unsigned int            output_height;
-       double                  acceptable_error;
-       int                     prompt;
-       Display                 *display;
-       Window                  root, window;
-       const unsigned int      mc_types[2] = {XVMC_MOCOMP | XVMC_MPEG_2, XVMC_IDCT | XVMC_MPEG_2};
-       XvPortID                port_num;
-       int                     surface_type_id;
-       unsigned int            is_overlay, intra_unsigned;
-       int                     colorkey;
-       XvMCContext             context;
-       XvMCSurface             surface;
-       XvMCBlockArray          block_array;
-       XvMCMacroBlockArray     mb_array;
-       int                     mbx, mby, bx, by;
-       XvMCMacroBlock          *mb;
-       short                   *blocks;
-       int                     quit = 0;
-
-       ParseArgs(argc, argv, &output_width, &output_height, &acceptable_error, &prompt);
-
-       display = XOpenDisplay(NULL);
-
-       if (!GetPort
-       (
-               display,
-               INPUT_WIDTH,
-               INPUT_HEIGHT,
-               XVMC_CHROMA_FORMAT_420,
-               mc_types,
-               2,
-               &port_num,
-               &surface_type_id,
-               &is_overlay,
-               &intra_unsigned
-       ))
-       {
-               XCloseDisplay(display);
-               error(1, 0, "Error, unable to find a good port.\n");
-       }
-
-       if (is_overlay)
-       {
-               Atom xv_colorkey = XInternAtom(display, "XV_COLORKEY", 0);
-               XvGetPortAttribute(display, port_num, xv_colorkey, &colorkey);
-       }
-
-       root = XDefaultRootWindow(display);
-       window = XCreateSimpleWindow(display, root, 0, 0, output_width, output_height, 0, 0, colorkey);
-
-       assert(XvMCCreateContext(display, port_num, surface_type_id, INPUT_WIDTH, INPUT_HEIGHT, XVMC_DIRECT, &context) == Success);
-       assert(XvMCCreateSurface(display, &context, &surface) == Success);
-       assert(XvMCCreateBlocks(display, &context, NUM_MACROBLOCKS * BLOCKS_PER_MACROBLOCK, &block_array) == Success);
-       assert(XvMCCreateMacroBlocks(display, &context, NUM_MACROBLOCKS, &mb_array) == Success);
-
-       mb = mb_array.macro_blocks;
-       blocks = block_array.blocks;
-
-       for (mby = 0; mby < INPUT_HEIGHT_IN_MACROBLOCKS; ++mby)
-               for (mbx = 0; mbx < INPUT_WIDTH_IN_MACROBLOCKS; ++mbx)
-               {
-                       mb->x = mbx;
-                       mb->y = mby;
-                       mb->macroblock_type = XVMC_MB_TYPE_INTRA;
-                       /*mb->motion_type = ;*/
-                       /*mb->motion_vertical_field_select = ;*/
-                       mb->dct_type = XVMC_DCT_TYPE_FRAME;
-                       /*mb->PMV[0][0][0] = ;
-                       mb->PMV[0][0][1] = ;
-                       mb->PMV[0][1][0] = ;
-                       mb->PMV[0][1][1] = ;
-                       mb->PMV[1][0][0] = ;
-                       mb->PMV[1][0][1] = ;
-                       mb->PMV[1][1][0] = ;
-                       mb->PMV[1][1][1] = ;*/
-                       mb->index = (mby * INPUT_WIDTH_IN_MACROBLOCKS + mbx) * BLOCKS_PER_MACROBLOCK;
-                       mb->coded_block_pattern = 0x3F;
-
-                       mb++;
-
-                       for (by = 0; by < MACROBLOCK_HEIGHT_IN_BLOCKS; ++by)
-                               for (bx = 0; bx < MACROBLOCK_WIDTH_IN_BLOCKS; ++bx)
-                               {
-                                       const int start = 16, stop = 235, range = stop - start;
-
-                                       Gradient
-                                       (
-                                               blocks,
-                                               (short)(start + range * ((mbx * MACROBLOCK_WIDTH + bx * BLOCK_WIDTH) / (float)(INPUT_WIDTH - 1))),
-                                               (short)(start + range * ((mbx * MACROBLOCK_WIDTH + bx * BLOCK_WIDTH + BLOCK_WIDTH - 1) / (float)(INPUT_WIDTH - 1))),
-                                               1
-                                       );
-
-                                       blocks += BLOCK_SIZE;
-                               }
-
-                       for (by = 0; by < MACROBLOCK_HEIGHT_IN_BLOCKS / 2; ++by)
-                               for (bx = 0; bx < MACROBLOCK_WIDTH_IN_BLOCKS / 2; ++bx)
-                               {
-                                       const int start = 16, stop = 240, range = stop - start;
-
-                                       Gradient
-                                       (
-                                               blocks,
-                                               (short)(start + range * ((mbx * MACROBLOCK_WIDTH + bx * BLOCK_WIDTH) / (float)(INPUT_WIDTH - 1))),
-                                               (short)(start + range * ((mbx * MACROBLOCK_WIDTH + bx * BLOCK_WIDTH + BLOCK_WIDTH - 1) / (float)(INPUT_WIDTH - 1))),
-                                               1
-                                       );
-
-                                       blocks += BLOCK_SIZE;
-
-                                       Gradient
-                                       (
-                                               blocks,
-                                               (short)(start + range * ((mbx * MACROBLOCK_WIDTH + bx * BLOCK_WIDTH) / (float)(INPUT_WIDTH - 1))),
-                                               (short)(start + range * ((mbx * MACROBLOCK_WIDTH + bx * BLOCK_WIDTH + BLOCK_WIDTH - 1) / (float)(INPUT_WIDTH - 1))),
-                                               1
-                                       );
-
-                                       blocks += BLOCK_SIZE;
-                               }
-               }
-
-       XSelectInput(display, window, ExposureMask | KeyPressMask);
-       XMapWindow(display, window);
-       XSync(display, 0);
-
-       /* Test NULL context */
-       assert(XvMCRenderSurface(display, NULL, XVMC_FRAME_PICTURE, &surface, NULL, NULL, 0, NUM_MACROBLOCKS, 0, &mb_array, &block_array) == XvMCBadContext);
-       /* Test NULL surface */
-       assert(XvMCRenderSurface(display, &context, XVMC_FRAME_PICTURE, NULL, NULL, NULL, 0, NUM_MACROBLOCKS, 0, &mb_array, &block_array) == XvMCBadSurface);
-       /* Test bad picture structure */
-       assert(XvMCRenderSurface(display, &context, 0, &surface, NULL, NULL, 0, NUM_MACROBLOCKS, 0, &mb_array, &block_array) == BadValue);
-       /* Test valid params */
-       assert(XvMCRenderSurface(display, &context, XVMC_FRAME_PICTURE, &surface, NULL, NULL, 0, NUM_MACROBLOCKS, 0, &mb_array, &block_array) == Success);
-
-       /* Test NULL surface */
-       assert(XvMCPutSurface(display, NULL, window, 0, 0, INPUT_WIDTH, INPUT_HEIGHT, 0, 0, output_width, output_height, XVMC_FRAME_PICTURE) == XvMCBadSurface);
-       /* Test bad window */
-       /* XXX: X halts with a bad drawable for some reason, doesn't return BadDrawable as expected */
-       /*assert(XvMCPutSurface(display, &surface, 0, 0, 0, width, height, 0, 0, width, height, XVMC_FRAME_PICTURE) == BadDrawable);*/
-
-       if (prompt)
-       {
-               puts("Press any button to quit...");
-
-               while (!quit)
-               {
-                       if (XPending(display) > 0)
-                       {
-                               XEvent event;
-
-                               XNextEvent(display, &event);
-
-                               switch (event.type)
-                               {
-                                       case Expose:
-                                       {
-                                               /* Test valid params */
-                                               assert
-                                               (
-                                                       XvMCPutSurface
-                                                       (
-                                                               display, &surface, window,
-                                                               0, 0, INPUT_WIDTH, INPUT_HEIGHT,
-                                                               0, 0, output_width, output_height,
-                                                               XVMC_FRAME_PICTURE
-                                                       ) == Success
-                                               );
-                                               break;
-                                       }
-                                       case KeyPress:
-                                       {
-                                               quit = 1;
-                                               break;
-                                       }
-                               }
-                       }
-               }
-       }
-
-       assert(XvMCDestroyBlocks(display, &block_array) == Success);
-       assert(XvMCDestroyMacroBlocks(display, &mb_array) == Success);
-       assert(XvMCDestroySurface(display, &surface) == Success);
-       assert(XvMCDestroyContext(display, &context) == Success);
-
-       XvUngrabPort(display, port_num, CurrentTime);
-       XDestroyWindow(display, window);
-       XCloseDisplay(display);
-
-       return 0;
-}
diff --git a/src/libXvMC/tests/test_surface.c b/src/libXvMC/tests/test_surface.c
deleted file mode 100644 (file)
index 25ebdcc..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-#include <assert.h>
-#include <error.h>
-#include "testlib.h"
-
-int main(int argc, char **argv)
-{
-       const unsigned int      width = 16, height = 16;
-       const unsigned int      mc_types[2] = {XVMC_MOCOMP | XVMC_MPEG_2, XVMC_IDCT | XVMC_MPEG_2};
-       
-       Display                 *display;
-       XvPortID                port_num;
-       int                     surface_type_id;
-       unsigned int            is_overlay, intra_unsigned;
-       int                     colorkey;
-       XvMCContext             context;
-       XvMCSurface             surface = {0};
-       
-       display = XOpenDisplay(NULL);
-       
-       if (!GetPort
-       (
-               display,
-               width,
-               height,
-               XVMC_CHROMA_FORMAT_420,
-               mc_types,
-               2,
-               &port_num,
-               &surface_type_id,
-               &is_overlay,
-               &intra_unsigned
-       ))
-       {
-               XCloseDisplay(display);
-               error(1, 0, "Error, unable to find a good port.\n");
-       }
-       
-       if (is_overlay)
-       {
-               Atom xv_colorkey = XInternAtom(display, "XV_COLORKEY", 0);
-               XvGetPortAttribute(display, port_num, xv_colorkey, &colorkey);
-       }
-       
-       assert(XvMCCreateContext(display, port_num, surface_type_id, width, height, XVMC_DIRECT, &context) == Success);
-       
-       /* Test NULL context */
-       assert(XvMCCreateSurface(display, NULL, &surface) == XvMCBadContext);
-       /* Test NULL surface */
-       assert(XvMCCreateSurface(display, &context, NULL) == XvMCBadSurface);
-       /* Test valid params */
-       assert(XvMCCreateSurface(display, &context, &surface) == Success);
-       /* Test surface id assigned */
-       assert(surface.surface_id != 0);
-       /* Test context id assigned and correct */
-       assert(surface.context_id == context.context_id);
-       /* Test surface type id assigned and correct */
-       assert(surface.surface_type_id == surface_type_id);
-       /* Test width & height assigned and correct */
-       assert(surface.width == width && surface.height == height);
-       /* Test valid params */
-       assert(XvMCDestroySurface(display, &surface) == Success);
-       /* Test NULL surface */
-       assert(XvMCDestroySurface(display, NULL) == XvMCBadSurface);
-       
-       assert(XvMCDestroyContext(display, &context) == Success);
-       
-       XvUngrabPort(display, port_num, CurrentTime);
-       XCloseDisplay(display);
-       
-       return 0;
-}
-
diff --git a/src/libXvMC/tests/testlib.c b/src/libXvMC/tests/testlib.c
deleted file mode 100644 (file)
index 59a03ca..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-#include "testlib.h"
-#include <stdio.h>
-
-/*
-void test(int pred, const char *pred_string, const char *doc_string, const char *file, unsigned int line)
-{
-       fputs(doc_string, stderr);
-       if (!pred)
-               fprintf(stderr, " FAIL!\n\t\"%s\" at %s:%u\n", pred_string, file, line);
-       else
-               fputs(" PASS!\n", stderr);
-}
-*/
-
-int GetPort
-(
-       Display *display,
-       unsigned int width,
-       unsigned int height,
-       unsigned int chroma_format,
-       const unsigned int *mc_types,
-       unsigned int num_mc_types,
-       XvPortID *port_id,
-       int *surface_type_id,
-       unsigned int *is_overlay,
-       unsigned int *intra_unsigned
-)
-{
-       unsigned int    found_port = 0;
-       XvAdaptorInfo   *adaptor_info;
-       unsigned int    num_adaptors;
-       int             num_types;
-       int             ev_base, err_base;
-       unsigned int    i, j, k, l;
-
-       if (!XvMCQueryExtension(display, &ev_base, &err_base))
-               return 0;
-       if (XvQueryAdaptors(display, XDefaultRootWindow(display), &num_adaptors, &adaptor_info) != Success)
-               return 0;
-
-       for (i = 0; i < num_adaptors && !found_port; ++i)
-       {
-               if (adaptor_info[i].type & XvImageMask)
-               {
-                       XvMCSurfaceInfo *surface_info = XvMCListSurfaceTypes(display, adaptor_info[i].base_id, &num_types);
-
-                       if (surface_info)
-                       {
-                               for (j = 0; j < num_types && !found_port; ++j)
-                               {
-                                       if
-                                       (
-                                               surface_info[j].chroma_format == chroma_format &&
-                                               surface_info[j].max_width >= width &&
-                                               surface_info[j].max_height >= height
-                                       )
-                                       {
-                                               for (k = 0; k < num_mc_types && !found_port; ++k)
-                                               {
-                                                       if (surface_info[j].mc_type == mc_types[k])
-                                                       {
-                                                               for (l = 0; l < adaptor_info[i].num_ports && !found_port; ++l)
-                                                               {
-                                                                       if (XvGrabPort(display, adaptor_info[i].base_id + l, CurrentTime) == Success)
-                                                                       {
-                                                                               *port_id = adaptor_info[i].base_id + l;
-                                                                               *surface_type_id = surface_info[j].surface_type_id;
-                                                                               *is_overlay = surface_info[j].flags & XVMC_OVERLAID_SURFACE;
-                                                                               *intra_unsigned = surface_info[j].flags & XVMC_INTRA_UNSIGNED;
-                                                                               found_port = 1;
-                                                                       }
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               }
-
-                               XFree(surface_info);
-                       }
-               }
-       }
-
-       XvFreeAdaptorInfo(adaptor_info);
-
-       return found_port;
-}
-
-unsigned int align(unsigned int value, unsigned int alignment)
-{
-       return (value + alignment - 1) & ~(alignment - 1);
-}
-
-/* From the glibc manual */
-int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y)
-{
-       /* Perform the carry for the later subtraction by updating y. */
-       if (x->tv_usec < y->tv_usec)
-       {
-               int nsec = (y->tv_usec - x->tv_usec) / 1000000 + 1;
-               y->tv_usec -= 1000000 * nsec;
-               y->tv_sec += nsec;
-       }
-       if (x->tv_usec - y->tv_usec > 1000000)
-       {
-               int nsec = (x->tv_usec - y->tv_usec) / 1000000;
-               y->tv_usec += 1000000 * nsec;
-               y->tv_sec -= nsec;
-       }
-
-       /*
-        * Compute the time remaining to wait.
-        * tv_usec is certainly positive.
-        */
-       result->tv_sec = x->tv_sec - y->tv_sec;
-       result->tv_usec = x->tv_usec - y->tv_usec;
-
-       /* Return 1 if result is negative. */
-       return x->tv_sec < y->tv_sec;
-}
diff --git a/src/libXvMC/tests/testlib.h b/src/libXvMC/tests/testlib.h
deleted file mode 100644 (file)
index af71ad7..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef testlib_h
-#define testlib_h
-
-/*
-#define TEST(pred, doc)        test(pred, #pred, doc, __FILE__, __LINE__)
-
-void test(int pred, const char *pred_string, const char *doc_string, const char *file, unsigned int line);
-*/
-
-#include <sys/time.h>
-#include <X11/Xlib.h>
-#include <X11/extensions/XvMClib.h>
-
-/*
- * display: IN                 A valid X display
- * width, height: IN           Surface size that the port must display
- * chroma_format: IN           Chroma format that the port must display
- * mc_types, num_mc_types: IN  List of MC types that the port must support, first port that matches the first mc_type will be returned
- * port_id: OUT                        Your port's ID
- * surface_type_id: OUT                Your port's surface ID
- * is_overlay: OUT             If 1, port uses overlay surfaces, you need to set a colorkey
- * intra_unsigned: OUT         If 1, port uses unsigned values for intra-coded blocks
- */
-int GetPort
-(
-       Display *display,
-       unsigned int width,
-       unsigned int height,
-       unsigned int chroma_format,
-       const unsigned int *mc_types,
-       unsigned int num_mc_types,
-       XvPortID *port_id,
-       int *surface_type_id,
-       unsigned int *is_overlay,
-       unsigned int *intra_unsigned
-);
-
-unsigned int align(unsigned int value, unsigned int alignment);
-
-int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y);
-
-#endif
diff --git a/src/libXvMC/tests/xvmc_bench.c b/src/libXvMC/tests/xvmc_bench.c
deleted file mode 100644 (file)
index d5a39ec..0000000
+++ /dev/null
@@ -1,271 +0,0 @@
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <error.h>
-#include <sys/time.h>
-#include "testlib.h"
-
-#define MACROBLOCK_WIDTH               16
-#define MACROBLOCK_HEIGHT              16
-#define BLOCKS_PER_MACROBLOCK          6
-
-#define DEFAULT_INPUT_WIDTH            720
-#define DEFAULT_INPUT_HEIGHT           480
-#define DEFAULT_REPS                   100
-
-#define PIPELINE_STEP_MC               1
-#define PIPELINE_STEP_CSC              2
-#define PIPELINE_STEP_SWAP             4
-
-#define MB_TYPE_I                      1
-#define MB_TYPE_P                      2
-#define MB_TYPE_B                      4
-
-struct Config
-{
-       unsigned int input_width;
-       unsigned int input_height;
-       unsigned int output_width;
-       unsigned int output_height;
-       unsigned int pipeline;
-       unsigned int mb_types;
-       unsigned int reps;
-};
-
-void ParseArgs(int argc, char **argv, struct Config *config)
-{
-       int fail = 0;
-       int i;
-
-       config->input_width = DEFAULT_INPUT_WIDTH;
-       config->input_height = DEFAULT_INPUT_HEIGHT;
-       config->output_width = 0;
-       config->output_height = 0;
-       config->pipeline = 0;
-       config->mb_types = 0;
-       config->reps = DEFAULT_REPS;
-
-       for (i = 1; i < argc && !fail; ++i)
-       {
-               if (!strcmp(argv[i], "-iw"))
-               {
-                       if (sscanf(argv[++i], "%u", &config->input_width) != 1)
-                               fail = 1;
-               }
-               else if (!strcmp(argv[i], "-ih"))
-               {
-                       if (sscanf(argv[++i], "%u", &config->input_height) != 1)
-                               fail = 1;
-               }
-               else if (!strcmp(argv[i], "-ow"))
-               {
-                       if (sscanf(argv[++i], "%u", &config->output_width) != 1)
-                               fail = 1;
-               }
-               else if (!strcmp(argv[i], "-oh"))
-               {
-                       if (sscanf(argv[++i], "%u", &config->output_height) != 1)
-                               fail = 1;
-               }
-               else if (!strcmp(argv[i], "-p"))
-               {
-                       char *token = strtok(argv[++i], ",");
-
-                       while (token && !fail)
-                       {
-                               if (!strcmp(token, "mc"))
-                                       config->pipeline |= PIPELINE_STEP_MC;
-                               else if (!strcmp(token, "csc"))
-                                       config->pipeline |= PIPELINE_STEP_CSC;
-                               else if (!strcmp(token, "swp"))
-                                       config->pipeline |= PIPELINE_STEP_SWAP;
-                               else
-                                       fail = 1;
-
-                               if (!fail)
-                                       token = strtok(NULL, ",");
-                       }
-               }
-               else if (!strcmp(argv[i], "-mb"))
-               {
-                       char *token = strtok(argv[++i], ",");
-
-                       while (token && !fail)
-                       {
-                               if (strcmp(token, "i"))
-                                       config->mb_types |= MB_TYPE_I;
-                               else if (strcmp(token, "p"))
-                                       config->mb_types |= MB_TYPE_P;
-                               else if (strcmp(token, "b"))
-                                       config->mb_types |= MB_TYPE_B;
-                               else
-                                       fail = 1;
-
-                               if (!fail)
-                                       token = strtok(NULL, ",");
-                       }
-               }
-               else if (!strcmp(argv[i], "-r"))
-               {
-                       if (sscanf(argv[++i], "%u", &config->reps) != 1)
-                               fail = 1;
-               }
-               else
-                       fail = 1;
-       }
-
-       if (fail)
-               error
-               (
-                       1, 0,
-                       "Bad argument.\n"
-                       "\n"
-                       "Usage: %s [options]\n"
-                       "\t-iw <width>\tInput width\n"
-                       "\t-ih <height>\tInput height\n"
-                       "\t-ow <width>\tOutput width\n"
-                       "\t-oh <height>\tOutput height\n"
-                       "\t-p <pipeline>\tPipeline to test\n"
-                       "\t-mb <mb type>\tMacroBlock types to use\n"
-                       "\t-r <reps>\tRepetitions\n\n"
-                       "\tPipeline steps: mc,csc,swap\n"
-                       "\tMB types: i,p,b\n",
-                       argv[0]
-               );
-
-       if (config->output_width == 0)
-               config->output_width = config->input_width;
-       if (config->output_height == 0)
-               config->output_height = config->input_height;
-       if (!config->pipeline)
-               config->pipeline = PIPELINE_STEP_MC | PIPELINE_STEP_CSC | PIPELINE_STEP_SWAP;
-       if (!config->mb_types)
-               config->mb_types = MB_TYPE_I | MB_TYPE_P | MB_TYPE_B;
-}
-
-int main(int argc, char **argv)
-{
-       struct Config           config;
-       Display                 *display;
-       Window                  root, window;
-       const unsigned int      mc_types[2] = {XVMC_MOCOMP | XVMC_MPEG_2, XVMC_IDCT | XVMC_MPEG_2};
-       XvPortID                port_num;
-       int                     surface_type_id;
-       unsigned int            is_overlay, intra_unsigned;
-       int                     colorkey;
-       XvMCContext             context;
-       XvMCSurface             surface;
-       XvMCBlockArray          block_array;
-       XvMCMacroBlockArray     mb_array;
-       unsigned int            mbw, mbh;
-       unsigned int            mbx, mby;
-       unsigned int            reps;
-       struct timeval          start, stop, diff;
-       double                  diff_secs;
-
-       ParseArgs(argc, argv, &config);
-
-       mbw = align(config.input_width, MACROBLOCK_WIDTH) / MACROBLOCK_WIDTH;
-       mbh = align(config.input_height, MACROBLOCK_HEIGHT) / MACROBLOCK_HEIGHT;
-
-       display = XOpenDisplay(NULL);
-
-       if (!GetPort
-       (
-               display,
-               config.input_width,
-               config.input_height,
-               XVMC_CHROMA_FORMAT_420,
-               mc_types,
-               2,
-               &port_num,
-               &surface_type_id,
-               &is_overlay,
-               &intra_unsigned
-       ))
-       {
-               XCloseDisplay(display);
-               error(1, 0, "Error, unable to find a good port.\n");
-       }
-
-       if (is_overlay)
-       {
-               Atom xv_colorkey = XInternAtom(display, "XV_COLORKEY", 0);
-               XvGetPortAttribute(display, port_num, xv_colorkey, &colorkey);
-       }
-
-       root = XDefaultRootWindow(display);
-       window = XCreateSimpleWindow(display, root, 0, 0, config.output_width, config.output_height, 0, 0, colorkey);
-
-       assert(XvMCCreateContext(display, port_num, surface_type_id, config.input_width, config.input_height, XVMC_DIRECT, &context) == Success);
-       assert(XvMCCreateSurface(display, &context, &surface) == Success);
-       assert(XvMCCreateBlocks(display, &context, mbw * mbh * BLOCKS_PER_MACROBLOCK, &block_array) == Success);
-       assert(XvMCCreateMacroBlocks(display, &context, mbw * mbh, &mb_array) == Success);
-
-       for (mby = 0; mby < mbh; ++mby)
-               for (mbx = 0; mbx < mbw; ++mbx)
-               {
-                       mb_array.macro_blocks[mby * mbw + mbx].x = mbx;
-                       mb_array.macro_blocks[mby * mbw + mbx].y = mby;
-                       mb_array.macro_blocks[mby * mbw + mbx].macroblock_type = XVMC_MB_TYPE_INTRA;
-                       /*mb->motion_type = ;*/
-                       /*mb->motion_vertical_field_select = ;*/
-                       mb_array.macro_blocks[mby * mbw + mbx].dct_type = XVMC_DCT_TYPE_FRAME;
-                       /*mb->PMV[0][0][0] = ;
-                       mb->PMV[0][0][1] = ;
-                       mb->PMV[0][1][0] = ;
-                       mb->PMV[0][1][1] = ;
-                       mb->PMV[1][0][0] = ;
-                       mb->PMV[1][0][1] = ;
-                       mb->PMV[1][1][0] = ;
-                       mb->PMV[1][1][1] = ;*/
-                       mb_array.macro_blocks[mby * mbw + mbx].index = (mby * mbw + mbx) * BLOCKS_PER_MACROBLOCK;
-                       mb_array.macro_blocks[mby * mbw + mbx].coded_block_pattern = 0x3F;
-               }
-
-       XSelectInput(display, window, ExposureMask | KeyPressMask);
-       XMapWindow(display, window);
-       XSync(display, 0);
-
-       gettimeofday(&start, NULL);
-
-       for (reps = 0; reps < config.reps; ++reps)
-       {
-               if (config.pipeline & PIPELINE_STEP_MC)
-               {
-                       assert(XvMCRenderSurface(display, &context, XVMC_FRAME_PICTURE, &surface, NULL, NULL, 0, mbw * mbh, 0, &mb_array, &block_array) == Success);
-                       assert(XvMCFlushSurface(display, &surface) == Success);
-               }
-               if (config.pipeline & PIPELINE_STEP_CSC)
-                       assert(XvMCPutSurface(display, &surface, window, 0, 0, config.input_width, config.input_height, 0, 0, config.output_width, config.output_height, XVMC_FRAME_PICTURE) == Success);
-       }
-
-       gettimeofday(&stop, NULL);
-
-       timeval_subtract(&diff, &stop, &start);
-       diff_secs = (double)diff.tv_sec + (double)diff.tv_usec / 1000000.0;
-
-       printf("XvMC Benchmark\n");
-       printf("Input: %u,%u\nOutput: %u,%u\n", config.input_width, config.input_height, config.output_width, config.output_height);
-       printf("Pipeline: ");
-       if (config.pipeline & PIPELINE_STEP_MC)
-               printf("|mc|");
-       if (config.pipeline & PIPELINE_STEP_CSC)
-               printf("|csc|");
-       if (config.pipeline & PIPELINE_STEP_SWAP)
-               printf("|swap|");
-       printf("\n");
-       printf("Reps: %u\n", config.reps);
-       printf("Total time: %.2lf (%.2lf reps / sec)\n", diff_secs, config.reps / diff_secs);
-
-       assert(XvMCDestroyBlocks(display, &block_array) == Success);
-       assert(XvMCDestroyMacroBlocks(display, &mb_array) == Success);
-       assert(XvMCDestroySurface(display, &surface) == Success);
-       assert(XvMCDestroyContext(display, &context) == Success);
-
-       XvUngrabPort(display, port_num, CurrentTime);
-       XDestroyWindow(display, window);
-       XCloseDisplay(display);
-
-       return 0;
-}
diff --git a/src/xvmc/Makefile b/src/xvmc/Makefile
new file mode 100644 (file)
index 0000000..7badcfd
--- /dev/null
@@ -0,0 +1,73 @@
+TARGET         = libXvMCg3dvl.so
+SONAME         = libXvMCg3dvl.so.1
+GALLIUMDIR     = ../gallium
+
+OBJECTS         = block.o surface.o context.o subpicture.o attributes.o
+
+ifeq (${DRIVER}, softpipe)
+OBJECTS         += ${GALLIUMDIR}/winsys/g3dvl/xsp_winsys.o
+endif
+
+CFLAGS += -g -fPIC -Wall -Werror=implicit-function-declaration \
+          -I${GALLIUMDIR}/state_trackers/g3dvl         \
+          -I${GALLIUMDIR}/winsys/g3dvl                 \
+          -I${GALLIUMDIR}/include                      \
+          -I${GALLIUMDIR}/auxiliary                    \
+          -I${GALLIUMDIR}/drivers
+
+ifeq (${DRIVER}, softpipe)
+LDFLAGS        += -L${GALLIUMDIR}/state_trackers/g3dvl         \
+          -L${GALLIUMDIR}/drivers/softpipe             \
+          -L${GALLIUMDIR}/auxiliary/tgsi               \
+          -L${GALLIUMDIR}/auxiliary/draw               \
+          -L${GALLIUMDIR}/auxiliary/translate          \
+          -L${GALLIUMDIR}/auxiliary/cso_cache          \
+          -L${GALLIUMDIR}/auxiliary/util               \
+          -L${GALLIUMDIR}/auxiliary/rtasm
+else
+LDFLAGS        += -L${GALLIUMDIR}/state_trackers/g3dvl         \
+          -L${GALLIUMDIR}/winsys/g3dvl/nouveau         \
+          -L${GALLIUMDIR}/auxiliary/util
+endif
+
+ifeq (${DRIVER}, softpipe)
+LIBS   += -lg3dvl -lsoftpipe -ldraw -ltgsi -ltranslate -lrtasm -lcso_cache -lutil -lm
+else
+LIBS   += -lg3dvl -lnouveau_dri -lutil
+endif
+
+#############################################
+
+ifeq (${DRIVER}, softpipe)
+.PHONY = all clean g3dvl
+else
+.PHONY = all clean g3dvl nouveau_winsys
+endif
+
+all: ${TARGET}
+
+ifeq (${DRIVER}, softpipe)
+${TARGET}: ${OBJECTS} g3dvl
+       $(CC) ${LDFLAGS} -shared -Wl,-soname,${SONAME} -o $@ ${OBJECTS} ${LIBS}
+
+g3dvl:
+       cd ${GALLIUMDIR}/state_trackers/g3dvl; ${MAKE}
+
+clean:
+       cd ${GALLIUMDIR}/state_trackers/g3dvl; ${MAKE} clean
+       rm -rf ${OBJECTS} ${TARGET}
+else
+${TARGET}: ${OBJECTS} g3dvl nouveau_winsys
+       $(CC) ${LDFLAGS} -shared -Wl,-soname,${SONAME} -o $@ ${OBJECTS} ${LIBS}
+
+g3dvl:
+       cd ${GALLIUMDIR}/state_trackers/g3dvl; ${MAKE}
+
+nouveau_winsys:
+       cd ${GALLIUMDIR}/winsys/g3dvl/nouveau; ${MAKE}
+
+clean:
+       cd ${GALLIUMDIR}/state_trackers/g3dvl; ${MAKE} clean
+       cd ${GALLIUMDIR}/winsys/g3dvl/nouveau; ${MAKE} clean
+       rm -rf ${OBJECTS} ${TARGET}
+endif
diff --git a/src/xvmc/attributes.c b/src/xvmc/attributes.c
new file mode 100644 (file)
index 0000000..674524b
--- /dev/null
@@ -0,0 +1,20 @@
+#include <assert.h>
+#include <X11/Xlib.h>
+#include <X11/extensions/Xvlib.h>
+#include <X11/extensions/XvMC.h>
+
+XvAttribute* XvMCQueryAttributes(Display *display, XvMCContext *context, int *number)
+{
+       return NULL;
+}
+
+Status XvMCSetAttribute(Display *display, XvMCContext *context, Atom attribute, int value)
+{
+       return BadImplementation;
+}
+
+Status XvMCGetAttribute(Display *display, XvMCContext *context, Atom attribute, int *value)
+{
+       return BadImplementation;
+}
+
diff --git a/src/xvmc/block.c b/src/xvmc/block.c
new file mode 100644 (file)
index 0000000..b38a89b
--- /dev/null
@@ -0,0 +1,79 @@
+#include <assert.h>
+#include <X11/Xlib.h>
+#include <X11/extensions/XvMC.h>
+#include <util/u_memory.h>
+#include <vl_display.h>
+#include <vl_screen.h>
+#include <vl_context.h>
+
+#define BLOCK_SIZE (64 * 2)
+
+Status XvMCCreateBlocks(Display *display, XvMCContext *context, unsigned int num_blocks, XvMCBlockArray *blocks)
+{
+       struct vlContext *vl_ctx;
+
+       assert(display);
+
+       if (!context)
+               return XvMCBadContext;
+       if (num_blocks == 0)
+               return BadValue;
+
+       assert(blocks);
+
+       vl_ctx = context->privData;
+       assert(display == vlGetNativeDisplay(vlGetDisplay(vlContextGetScreen(vl_ctx))));
+
+       blocks->context_id = context->context_id;
+       blocks->num_blocks = num_blocks;
+       blocks->blocks = MALLOC(BLOCK_SIZE * num_blocks);
+       /* Since we don't have a VL type for blocks, set privData to the display so we can catch mismatches */
+       blocks->privData = display;
+
+       return Success;
+}
+
+Status XvMCDestroyBlocks(Display *display, XvMCBlockArray *blocks)
+{
+       assert(display);
+       assert(blocks);
+       assert(display == blocks->privData);
+       FREE(blocks->blocks);
+
+       return Success;
+}
+
+Status XvMCCreateMacroBlocks(Display *display, XvMCContext *context, unsigned int num_blocks, XvMCMacroBlockArray *blocks)
+{
+       struct vlContext *vl_ctx;
+
+       assert(display);
+
+       if (!context)
+               return XvMCBadContext;
+       if (num_blocks == 0)
+               return BadValue;
+
+       assert(blocks);
+
+       vl_ctx = context->privData;
+       assert(display == vlGetNativeDisplay(vlGetDisplay(vlContextGetScreen(vl_ctx))));
+
+       blocks->context_id = context->context_id;
+       blocks->num_blocks = num_blocks;
+       blocks->macro_blocks = MALLOC(sizeof(XvMCMacroBlock) * num_blocks);
+       /* Since we don't have a VL type for blocks, set privData to the display so we can catch mismatches */
+       blocks->privData = display;
+
+       return Success;
+}
+
+Status XvMCDestroyMacroBlocks(Display *display, XvMCMacroBlockArray *blocks)
+{
+       assert(display);
+       assert(blocks);
+       assert(display == blocks->privData);
+       FREE(blocks->macro_blocks);
+
+       return Success;
+}
diff --git a/src/xvmc/context.c b/src/xvmc/context.c
new file mode 100644 (file)
index 0000000..273f658
--- /dev/null
@@ -0,0 +1,207 @@
+#include <assert.h>
+#include <X11/Xlib.h>
+#include <X11/extensions/XvMClib.h>
+#include <pipe/p_context.h>
+#include <vl_display.h>
+#include <vl_screen.h>
+#include <vl_context.h>
+#include <vl_winsys.h>
+
+static Status Validate
+(
+       Display *display,
+       XvPortID port,
+       int surface_type_id,
+       unsigned int width,
+       unsigned int height,
+       int flags,
+       int *found_port,
+       int *chroma_format,
+       int *mc_type
+)
+{
+       unsigned int    found_surface = 0;
+       XvAdaptorInfo   *adaptor_info;
+       unsigned int    num_adaptors;
+       int             num_types;
+       unsigned int    max_width, max_height;
+       Status          ret;
+       unsigned int    i, j, k;
+
+       assert(display && chroma_format);
+
+       *found_port = 0;
+
+       ret = XvQueryAdaptors(display, XDefaultRootWindow(display), &num_adaptors, &adaptor_info);
+       if (ret != Success)
+               return ret;
+
+       /* Scan through all adaptors looking for this port and surface */
+       for (i = 0; i < num_adaptors && !*found_port; ++i)
+       {
+               /* Scan through all ports of this adaptor looking for our port */
+               for (j = 0; j < adaptor_info[i].num_ports && !*found_port; ++j)
+               {
+                       /* If this is our port, scan through all its surfaces looking for our surface */
+                       if (adaptor_info[i].base_id + j == port)
+                       {
+                               XvMCSurfaceInfo *surface_info;
+
+                               *found_port = 1;
+                               surface_info = XvMCListSurfaceTypes(display, adaptor_info[i].base_id, &num_types);
+
+                               if (surface_info)
+                               {
+                                       for (k = 0; k < num_types && !found_surface; ++k)
+                                       {
+                                               if (surface_info[k].surface_type_id == surface_type_id)
+                                               {
+                                                       found_surface = 1;
+                                                       max_width = surface_info[k].max_width;
+                                                       max_height = surface_info[k].max_height;
+                                                       *chroma_format = surface_info[k].chroma_format;
+                                                       *mc_type = surface_info[k].mc_type;
+                                               }
+                                       }
+
+                                       XFree(surface_info);
+                               }
+                               else
+                               {
+                                       XvFreeAdaptorInfo(adaptor_info);
+                                       return BadAlloc;
+                               }
+                       }
+               }
+       }
+
+       XvFreeAdaptorInfo(adaptor_info);
+
+       if (!*found_port)
+               return XvBadPort;
+       if (!found_surface)
+               return BadMatch;
+       if (width > max_width || height > max_height)
+               return BadValue;
+       if (flags != XVMC_DIRECT && flags != 0)
+               return BadValue;
+
+       return Success;
+}
+
+static enum vlProfile ProfileToVL(int xvmc_profile)
+{
+       if (xvmc_profile & XVMC_MPEG_1)
+               assert(0);
+       else if (xvmc_profile & XVMC_MPEG_2)
+               return vlProfileMpeg2Main;
+       else if (xvmc_profile & XVMC_H263)
+               assert(0);
+       else if (xvmc_profile & XVMC_MPEG_4)
+               assert(0);
+       else
+               assert(0);
+
+       return -1;
+}
+
+static enum vlEntryPoint EntryToVL(int xvmc_entry)
+{
+       return xvmc_entry & XVMC_IDCT ? vlEntryPointIDCT : vlEntryPointMC;
+}
+
+static enum vlFormat FormatToVL(int xvmc_format)
+{
+       switch (xvmc_format)
+       {
+               case XVMC_CHROMA_FORMAT_420:
+                       return vlFormatYCbCr420;
+               case XVMC_CHROMA_FORMAT_422:
+                       return vlFormatYCbCr422;
+               case XVMC_CHROMA_FORMAT_444:
+                       return vlFormatYCbCr444;
+               default:
+                       assert(0);
+       }
+
+       return -1;
+}
+
+Status XvMCCreateContext(Display *display, XvPortID port, int surface_type_id, int width, int height, int flags, XvMCContext *context)
+{
+       int                     found_port;
+       int                     chroma_format;
+       int                     mc_type;
+       Status                  ret;
+       struct vlDisplay        *vl_dpy;
+       struct vlScreen         *vl_scrn;
+       struct vlContext        *vl_ctx;
+       struct pipe_context     *pipe;
+
+       assert(display);
+
+       if (!context)
+               return XvMCBadContext;
+
+       ret = Validate(display, port, surface_type_id, width, height, flags, &found_port, &chroma_format, &mc_type);
+
+       /* XXX: Success and XvBadPort have the same value */
+       if (ret != Success || !found_port)
+               return ret;
+
+       /* XXX: Assumes default screen, should check which screen port is on */
+       pipe = create_pipe_context(display, XDefaultScreen(display));
+
+       assert(pipe);
+
+       vlCreateDisplay(display, &vl_dpy);
+       vlCreateScreen(vl_dpy, XDefaultScreen(display), pipe->screen, &vl_scrn);
+       vlCreateContext
+       (
+               vl_scrn,
+               pipe,
+               width,
+               height,
+               FormatToVL(chroma_format),
+               ProfileToVL(mc_type),
+               EntryToVL(mc_type),
+               &vl_ctx
+       );
+
+       context->context_id = XAllocID(display);
+       context->surface_type_id = surface_type_id;
+       context->width = width;
+       context->height = height;
+       context->flags = flags;
+       context->port = port;
+       context->privData = vl_ctx;
+
+       return Success;
+}
+
+Status XvMCDestroyContext(Display *display, XvMCContext *context)
+{
+       struct vlContext        *vl_ctx;
+       struct vlScreen         *vl_screen;
+       struct vlDisplay        *vl_dpy;
+       struct pipe_context     *pipe;
+
+       assert(display);
+
+       if (!context)
+               return XvMCBadContext;
+
+       vl_ctx = context->privData;
+
+       assert(display == vlGetNativeDisplay(vlGetDisplay(vlContextGetScreen(vl_ctx))));
+
+       pipe = vlGetPipeContext(vl_ctx);
+       vl_screen = vlContextGetScreen(vl_ctx);
+       vl_dpy = vlGetDisplay(vl_screen);
+       vlDestroyContext(vl_ctx);
+       vlDestroyScreen(vl_screen);
+       vlDestroyDisplay(vl_dpy);
+       destroy_pipe_context(pipe);
+
+       return Success;
+}
diff --git a/src/xvmc/subpicture.c b/src/xvmc/subpicture.c
new file mode 100644 (file)
index 0000000..c8f70c9
--- /dev/null
@@ -0,0 +1,215 @@
+#include <assert.h>
+#include <X11/Xlib.h>
+#include <X11/extensions/Xvlib.h>
+#include <X11/extensions/XvMC.h>
+
+Status XvMCCreateSubpicture
+(
+       Display *display,
+       XvMCContext *context,
+       XvMCSubpicture *subpicture,
+       unsigned short width,
+       unsigned short height,
+       int xvimage_id
+)
+{
+       assert(display);
+       
+       if (!context)
+               return XvMCBadContext;
+       
+       assert(subpicture);
+       
+       if (width > 2048 || height > 2048)
+               return BadValue;
+       
+       if (xvimage_id != 123)
+               return BadMatch;
+       
+       subpicture->subpicture_id = XAllocID(display);
+       subpicture->context_id = context->context_id;
+       subpicture->xvimage_id = xvimage_id;
+       subpicture->width = width;
+       subpicture->height = height;
+       subpicture->num_palette_entries = 0;
+       subpicture->entry_bytes = 0;
+       subpicture->component_order[0] = 0;
+       subpicture->component_order[1] = 0;
+       subpicture->component_order[2] = 0;
+       subpicture->component_order[3] = 0;
+       /* TODO: subpicture->privData = ;*/
+       
+       return Success;
+}
+
+Status XvMCClearSubpicture
+(
+       Display *display,
+       XvMCSubpicture *subpicture,
+       short x,
+       short y,
+       unsigned short width,
+       unsigned short height,
+       unsigned int color
+)
+{
+       assert(display);
+       
+       if (!subpicture)
+               return XvMCBadSubpicture;
+       
+       /* TODO: Assert clear rect is within bounds? Or clip? */
+       
+       return Success;
+}
+
+Status XvMCCompositeSubpicture
+(
+       Display *display,
+       XvMCSubpicture *subpicture,
+       XvImage *image,
+       short srcx,
+       short srcy,
+       unsigned short width,
+       unsigned short height,
+       short dstx,
+       short dsty
+)
+{
+       assert(display);
+       
+       if (!subpicture)
+               return XvMCBadSubpicture;
+       
+       assert(image);
+       
+       if (subpicture->xvimage_id != image->id)
+               return BadMatch;
+       
+       /* TODO: Assert rects are within bounds? Or clip? */
+       
+       return Success;
+}
+
+Status XvMCDestroySubpicture(Display *display, XvMCSubpicture *subpicture)
+{
+       assert(display);
+       
+       if (!subpicture)
+               return XvMCBadSubpicture;
+       
+       return BadImplementation;
+}
+
+Status XvMCSetSubpicturePalette(Display *display, XvMCSubpicture *subpicture, unsigned char *palette)
+{
+       assert(display);
+       
+       if (!subpicture)
+               return XvMCBadSubpicture;
+       
+       assert(palette);
+       
+       /* We don't support paletted subpictures */
+       return BadMatch;
+}
+
+Status XvMCBlendSubpicture
+(
+       Display *display,
+       XvMCSurface *target_surface,
+       XvMCSubpicture *subpicture,
+       short subx,
+       short suby,
+       unsigned short subw,
+       unsigned short subh,
+       short surfx,
+       short surfy,
+       unsigned short surfw,
+       unsigned short surfh
+)
+{
+       assert(display);
+       
+       if (!target_surface)
+               return XvMCBadSurface;
+       
+       if (!subpicture)
+               return XvMCBadSubpicture;
+       
+       if (target_surface->context_id != subpicture->context_id)
+               return BadMatch;
+       
+       /* TODO: Assert rects are within bounds? Or clip? */
+       return Success;
+}
+
+Status XvMCBlendSubpicture2
+(
+       Display *display,
+       XvMCSurface *source_surface,
+       XvMCSurface *target_surface,
+       XvMCSubpicture *subpicture,
+       short subx,
+       short suby,
+       unsigned short subw,
+       unsigned short subh,
+       short surfx,
+       short surfy,
+       unsigned short surfw,
+       unsigned short surfh
+)
+{
+       assert(display);
+       
+       if (!source_surface || !target_surface)
+               return XvMCBadSurface;
+       
+       if (!subpicture)
+               return XvMCBadSubpicture;
+       
+       if (source_surface->context_id != subpicture->context_id)
+               return BadMatch;
+               
+       if (source_surface->context_id != subpicture->context_id)
+               return BadMatch;
+       
+       /* TODO: Assert rects are within bounds? Or clip? */
+       return Success;
+}
+
+Status XvMCSyncSubpicture(Display *display, XvMCSubpicture *subpicture)
+{
+       assert(display);
+       
+       if (!subpicture)
+               return XvMCBadSubpicture;
+       
+       return Success;
+}
+
+Status XvMCFlushSubpicture(Display *display, XvMCSubpicture *subpicture)
+{
+       assert(display);
+       
+       if (!subpicture)
+               return XvMCBadSubpicture;
+       
+       return Success;
+}
+
+Status XvMCGetSubpictureStatus(Display *display, XvMCSubpicture *subpicture, int *status)
+{
+       assert(display);
+       
+       if (!subpicture)
+               return XvMCBadSubpicture;
+       
+       assert(status);
+       
+       /* TODO */
+       *status = 0;
+       
+       return Success;
+}
+
diff --git a/src/xvmc/surface.c b/src/xvmc/surface.c
new file mode 100644 (file)
index 0000000..67c179e
--- /dev/null
@@ -0,0 +1,356 @@
+#include <assert.h>
+#include <X11/Xlib.h>
+#include <X11/extensions/XvMC.h>
+#include <vl_display.h>
+#include <vl_screen.h>
+#include <vl_context.h>
+#include <vl_surface.h>
+#include <vl_types.h>
+
+static enum vlMacroBlockType TypeToVL(int xvmc_mb_type)
+{
+       if (xvmc_mb_type & XVMC_MB_TYPE_INTRA)
+               return vlMacroBlockTypeIntra;
+       if ((xvmc_mb_type & (XVMC_MB_TYPE_MOTION_FORWARD | XVMC_MB_TYPE_MOTION_BACKWARD)) == XVMC_MB_TYPE_MOTION_FORWARD)
+               return vlMacroBlockTypeFwdPredicted;
+       if ((xvmc_mb_type & (XVMC_MB_TYPE_MOTION_FORWARD | XVMC_MB_TYPE_MOTION_BACKWARD)) == XVMC_MB_TYPE_MOTION_BACKWARD)
+               return vlMacroBlockTypeBkwdPredicted;
+       if ((xvmc_mb_type & (XVMC_MB_TYPE_MOTION_FORWARD | XVMC_MB_TYPE_MOTION_BACKWARD)) == (XVMC_MB_TYPE_MOTION_FORWARD | XVMC_MB_TYPE_MOTION_BACKWARD))
+               return vlMacroBlockTypeBiPredicted;
+
+       assert(0);
+
+       return -1;
+}
+
+static enum vlPictureType PictureToVL(int xvmc_pic)
+{
+       switch (xvmc_pic)
+       {
+               case XVMC_TOP_FIELD:
+                       return vlPictureTypeTopField;
+               case XVMC_BOTTOM_FIELD:
+                       return vlPictureTypeBottomField;
+               case XVMC_FRAME_PICTURE:
+                       return vlPictureTypeFrame;
+               default:
+                       assert(0);
+       }
+
+       return -1;
+}
+
+static enum vlMotionType MotionToVL(int xvmc_motion_type, int xvmc_dct_type)
+{
+       switch (xvmc_motion_type)
+       {
+               case XVMC_PREDICTION_FRAME:
+                       return xvmc_dct_type == XVMC_DCT_TYPE_FIELD ? vlMotionType16x8 : vlMotionTypeFrame;
+               case XVMC_PREDICTION_FIELD:
+                       return vlMotionTypeField;
+               case XVMC_PREDICTION_DUAL_PRIME:
+                       return vlMotionTypeDualPrime;
+               default:
+                       assert(0);
+       }
+
+       return -1;
+}
+
+Status XvMCCreateSurface(Display *display, XvMCContext *context, XvMCSurface *surface)
+{
+       struct vlContext *vl_ctx;
+       struct vlSurface *vl_sfc;
+
+       assert(display);
+
+       if (!context)
+               return XvMCBadContext;
+       if (!surface)
+               return XvMCBadSurface;
+
+       vl_ctx = context->privData;
+
+       assert(display == vlGetNativeDisplay(vlGetDisplay(vlContextGetScreen(vl_ctx))));
+
+       vlCreateSurface
+       (
+               vlContextGetScreen(vl_ctx),
+               context->width,
+               context->height,
+               vlGetPictureFormat(vl_ctx),
+               &vl_sfc
+       );
+
+       vlBindToContext(vl_sfc, vl_ctx);
+
+       surface->surface_id = XAllocID(display);
+       surface->context_id = context->context_id;
+       surface->surface_type_id = context->surface_type_id;
+       surface->width = context->width;
+       surface->height = context->height;
+       surface->privData = vl_sfc;
+
+       return Success;
+}
+
+Status XvMCRenderSurface
+(
+       Display *display,
+       XvMCContext *context,
+       unsigned int picture_structure,
+       XvMCSurface *target_surface,
+       XvMCSurface *past_surface,
+       XvMCSurface *future_surface,
+       unsigned int flags,
+       unsigned int num_macroblocks,
+       unsigned int first_macroblock,
+       XvMCMacroBlockArray *macroblocks,
+       XvMCBlockArray *blocks
+)
+{
+       struct vlContext                *vl_ctx;
+       struct vlSurface                *target_vl_surface;
+       struct vlSurface                *past_vl_surface;
+       struct vlSurface                *future_vl_surface;
+       struct vlMpeg2MacroBlockBatch   batch;
+       struct vlMpeg2MacroBlock        vl_macroblocks[num_macroblocks];
+       unsigned int                    i;
+
+       assert(display);
+
+       if (!context)
+               return XvMCBadContext;
+       if (!target_surface)
+               return XvMCBadSurface;
+
+       if
+       (
+               picture_structure != XVMC_TOP_FIELD &&
+               picture_structure != XVMC_BOTTOM_FIELD &&
+               picture_structure != XVMC_FRAME_PICTURE
+       )
+               return BadValue;
+       if (future_surface && !past_surface)
+               return BadMatch;
+
+       vl_ctx = context->privData;
+
+       assert(display == vlGetNativeDisplay(vlGetDisplay(vlContextGetScreen(vl_ctx))));
+
+       target_vl_surface = target_surface->privData;
+       past_vl_surface = past_surface ? past_surface->privData : NULL;
+       future_vl_surface = future_surface ? future_surface->privData : NULL;
+
+       assert(context->context_id == target_surface->context_id);
+       assert(!past_surface || context->context_id == past_surface->context_id);
+       assert(!future_surface || context->context_id == future_surface->context_id);
+
+       assert(macroblocks);
+       assert(blocks);
+
+       assert(macroblocks->context_id == context->context_id);
+       assert(blocks->context_id == context->context_id);
+
+       assert(flags == 0 || flags == XVMC_SECOND_FIELD);
+
+       batch.past_surface = past_vl_surface;
+       batch.future_surface = future_vl_surface;
+       batch.picture_type = PictureToVL(picture_structure);
+       batch.field_order = flags & XVMC_SECOND_FIELD ? vlFieldOrderSecond : vlFieldOrderFirst;
+       batch.num_macroblocks = num_macroblocks;
+       batch.macroblocks = vl_macroblocks;
+
+       for (i = 0; i < num_macroblocks; ++i)
+       {
+               unsigned int j = first_macroblock + i;
+
+               unsigned int k, l, m;
+
+               batch.macroblocks[i].mbx = macroblocks->macro_blocks[j].x;
+               batch.macroblocks[i].mby = macroblocks->macro_blocks[j].y;
+               batch.macroblocks[i].mb_type = TypeToVL(macroblocks->macro_blocks[j].macroblock_type);
+               if (batch.macroblocks[i].mb_type != vlMacroBlockTypeIntra)
+                       batch.macroblocks[i].mo_type = MotionToVL(macroblocks->macro_blocks[j].motion_type, macroblocks->macro_blocks[j].dct_type);
+               batch.macroblocks[i].dct_type = macroblocks->macro_blocks[j].dct_type == XVMC_DCT_TYPE_FIELD ? vlDCTTypeFieldCoded : vlDCTTypeFrameCoded;
+
+               for (k = 0; k < 2; ++k)
+                       for (l = 0; l < 2; ++l)
+                               for (m = 0; m < 2; ++m)
+                                       batch.macroblocks[i].PMV[k][l][m] = macroblocks->macro_blocks[j].PMV[k][l][m];
+
+               batch.macroblocks[i].cbp = macroblocks->macro_blocks[j].coded_block_pattern;
+               batch.macroblocks[i].blocks = blocks->blocks + (macroblocks->macro_blocks[j].index * 64);
+       }
+
+       vlRenderMacroBlocksMpeg2(&batch, target_vl_surface);
+
+       return Success;
+}
+
+Status XvMCFlushSurface(Display *display, XvMCSurface *surface)
+{
+       struct vlSurface *vl_sfc;
+
+       assert(display);
+
+       if (!surface)
+               return XvMCBadSurface;
+
+       vl_sfc = surface->privData;
+
+       assert(display == vlGetNativeDisplay(vlGetDisplay(vlSurfaceGetScreen(vl_sfc))));
+
+       vlSurfaceFlush(vl_sfc);
+
+       return Success;
+}
+
+Status XvMCSyncSurface(Display *display, XvMCSurface *surface)
+{
+       struct vlSurface *vl_sfc;
+
+       assert(display);
+
+       if (!surface)
+               return XvMCBadSurface;
+
+       vl_sfc = surface->privData;
+
+       assert(display == vlGetNativeDisplay(vlGetDisplay(vlSurfaceGetScreen(vl_sfc))));
+
+       vlSurfaceSync(vl_sfc);
+
+       return Success;
+}
+
+Status XvMCPutSurface
+(
+       Display *display,
+       XvMCSurface *surface,
+       Drawable drawable,
+       short srcx,
+       short srcy,
+       unsigned short srcw,
+       unsigned short srch,
+       short destx,
+       short desty,
+       unsigned short destw,
+       unsigned short desth,
+       int flags
+)
+{
+       Window                  root;
+       int                     x, y;
+       unsigned int            width, height;
+       unsigned int            border_width;
+       unsigned int            depth;
+       struct vlSurface        *vl_sfc;
+
+       assert(display);
+
+       if (!surface)
+               return XvMCBadSurface;
+
+       if (XGetGeometry(display, drawable, &root, &x, &y, &width, &height, &border_width, &depth) == BadDrawable)
+               return BadDrawable;
+
+       assert(flags == XVMC_TOP_FIELD || flags == XVMC_BOTTOM_FIELD || flags == XVMC_FRAME_PICTURE);
+
+       /* TODO: Correct for negative srcx,srcy & destx,desty by clipping */
+
+       assert(srcx + srcw - 1 < surface->width);
+       assert(srcy + srch - 1 < surface->height);
+       /* XXX: Some apps (mplayer) hit these asserts because they call
+        * this function after the window has been resized by the WM
+        * but before they've handled the corresponding XEvent and
+        * know about the new dimensions. The output will be clipped
+        * for a few frames until the app updates destw and desth.
+        */
+       /*assert(destx + destw - 1 < width);
+       assert(desty + desth - 1 < height);*/
+
+       vl_sfc = surface->privData;
+
+       vlPutPicture(vl_sfc, drawable, srcx, srcy, srcw, srch, destx, desty, destw, desth, width, height, PictureToVL(flags));
+
+       return Success;
+}
+
+Status XvMCGetSurfaceStatus(Display *display, XvMCSurface *surface, int *status)
+{
+       struct vlSurface        *vl_sfc;
+       enum vlResourceStatus   res_status;
+
+       assert(display);
+
+       if (!surface)
+               return XvMCBadSurface;
+
+       assert(status);
+
+       vl_sfc = surface->privData;
+
+       assert(display == vlGetNativeDisplay(vlGetDisplay(vlSurfaceGetScreen(vl_sfc))));
+
+       vlSurfaceGetStatus(vl_sfc, &res_status);
+
+       switch (res_status)
+       {
+               case vlResourceStatusFree:
+               {
+                       *status = 0;
+                       break;
+               }
+               case vlResourceStatusRendering:
+               {
+                       *status = XVMC_RENDERING;
+                       break;
+               }
+               case vlResourceStatusDisplaying:
+               {
+                       *status = XVMC_DISPLAYING;
+                       break;
+               }
+               default:
+                       assert(0);
+       }
+
+       return Success;
+}
+
+Status XvMCDestroySurface(Display *display, XvMCSurface *surface)
+{
+       struct vlSurface *vl_sfc;
+
+       assert(display);
+
+       if (!surface)
+               return XvMCBadSurface;
+
+       vl_sfc = surface->privData;
+
+       assert(display == vlGetNativeDisplay(vlGetDisplay(vlSurfaceGetScreen(vl_sfc))));
+
+       vlDestroySurface(vl_sfc);
+
+       return Success;
+}
+
+Status XvMCHideSurface(Display *display, XvMCSurface *surface)
+{
+       struct vlSurface *vl_sfc;
+
+       assert(display);
+
+       if (!surface)
+               return XvMCBadSurface;
+
+       vl_sfc = surface->privData;
+
+       assert(display == vlGetNativeDisplay(vlGetDisplay(vlSurfaceGetScreen(vl_sfc))));
+
+       /* No op, only for overlaid rendering */
+
+       return Success;
+}
diff --git a/src/xvmc/tests/.gitignore b/src/xvmc/tests/.gitignore
new file mode 100644 (file)
index 0000000..e1d2f90
--- /dev/null
@@ -0,0 +1,5 @@
+test_context
+test_surface
+test_blocks
+test_rendering
+xvmc_bench
diff --git a/src/xvmc/tests/Makefile b/src/xvmc/tests/Makefile
new file mode 100644 (file)
index 0000000..de09516
--- /dev/null
@@ -0,0 +1,27 @@
+CFLAGS += -g -Wall
+LDFLAGS        +=
+LIBS   += -lXvMCW -lXvMC -lXv
+
+#############################################
+
+.PHONY = all clean
+
+all: test_context test_surface test_blocks test_rendering xvmc_bench
+
+test_context: test_context.o testlib.o
+       $(CC) ${LDFLAGS} -o $@ $^ ${LIBS}
+
+test_surface: test_surface.o testlib.o
+       $(CC) ${LDFLAGS} -o $@ $^ ${LIBS}
+
+test_blocks: test_blocks.o testlib.o
+       $(CC) ${LDFLAGS} -o $@ $^ ${LIBS}
+
+test_rendering: test_rendering.o testlib.o
+       $(CC) ${LDFLAGS} -o $@ $^ ${LIBS}
+
+xvmc_bench: xvmc_bench.o testlib.o
+       $(CC) ${LDFLAGS} -o $@ $^ ${LIBS}
+
+clean:
+       rm -rf *.o test_context test_surface test_blocks test_rendering xvmc_bench
diff --git a/src/xvmc/tests/test_blocks.c b/src/xvmc/tests/test_blocks.c
new file mode 100644 (file)
index 0000000..dc80adf
--- /dev/null
@@ -0,0 +1,84 @@
+#include <assert.h>
+#include <error.h>
+#include "testlib.h"
+
+int main(int argc, char **argv)
+{
+       const unsigned int      width = 16, height = 16;
+       const unsigned int      min_required_blocks = 1, min_required_macroblocks = 1;
+       const unsigned int      mc_types[2] = {XVMC_MOCOMP | XVMC_MPEG_2, XVMC_IDCT | XVMC_MPEG_2};
+
+       Display                 *display;
+       XvPortID                port_num;
+       int                     surface_type_id;
+       unsigned int            is_overlay, intra_unsigned;
+       int                     colorkey;
+       XvMCContext             context;
+       XvMCSurface             surface;
+       XvMCBlockArray          blocks = {0};
+       XvMCMacroBlockArray     macroblocks = {0};
+
+       display = XOpenDisplay(NULL);
+
+       if (!GetPort
+       (
+               display,
+               width,
+               height,
+               XVMC_CHROMA_FORMAT_420,
+               mc_types,
+               2,
+               &port_num,
+               &surface_type_id,
+               &is_overlay,
+               &intra_unsigned
+       ))
+       {
+               XCloseDisplay(display);
+               error(1, 0, "Error, unable to find a good port.\n");
+       }
+
+       if (is_overlay)
+       {
+               Atom xv_colorkey = XInternAtom(display, "XV_COLORKEY", 0);
+               XvGetPortAttribute(display, port_num, xv_colorkey, &colorkey);
+       }
+
+       assert(XvMCCreateContext(display, port_num, surface_type_id, width, height, XVMC_DIRECT, &context) == Success);
+       assert(XvMCCreateSurface(display, &context, &surface) == Success);
+
+       /* Test NULL context */
+       assert(XvMCCreateBlocks(display, NULL, 1, &blocks) == XvMCBadContext);
+       /* Test 0 blocks */
+       assert(XvMCCreateBlocks(display, &context, 0, &blocks) == BadValue);
+       /* Test valid params */
+       assert(XvMCCreateBlocks(display, &context, min_required_blocks, &blocks) == Success);
+       /* Test context id assigned and correct */
+       assert(blocks.context_id == context.context_id);
+       /* Test number of blocks assigned and correct */
+       assert(blocks.num_blocks == min_required_blocks);
+       /* Test block pointer valid */
+       assert(blocks.blocks != NULL);
+       /* Test NULL context */
+       assert(XvMCCreateMacroBlocks(display, NULL, 1, &macroblocks) == XvMCBadContext);
+       /* Test 0 macroblocks */
+       assert(XvMCCreateMacroBlocks(display, &context, 0, &macroblocks) == BadValue);
+       /* Test valid params */
+       assert(XvMCCreateMacroBlocks(display, &context, min_required_macroblocks, &macroblocks) == Success);
+       /* Test context id assigned and correct */
+       assert(macroblocks.context_id == context.context_id);
+       /* Test macroblock pointer valid */
+       assert(macroblocks.macro_blocks != NULL);
+       /* Test valid params */
+       assert(XvMCDestroyMacroBlocks(display, &macroblocks) == Success);
+       /* Test valid params */
+       assert(XvMCDestroyBlocks(display, &blocks) == Success);
+
+       assert(XvMCDestroySurface(display, &surface) == Success);
+       assert(XvMCDestroyContext(display, &context) == Success);
+
+       XvUngrabPort(display, port_num, CurrentTime);
+       XCloseDisplay(display);
+
+       return 0;
+}
diff --git a/src/xvmc/tests/test_context.c b/src/xvmc/tests/test_context.c
new file mode 100644 (file)
index 0000000..53f7449
--- /dev/null
@@ -0,0 +1,92 @@
+#include <assert.h>
+#include <error.h>
+#include "testlib.h"
+
+int main(int argc, char **argv)
+{
+       const unsigned int      width = 16, height = 16;
+       const unsigned int      mc_types[2] = {XVMC_MOCOMP | XVMC_MPEG_2, XVMC_IDCT | XVMC_MPEG_2};
+
+       Display                 *display;
+       XvPortID                port_num;
+       int                     surface_type_id;
+       unsigned int            is_overlay, intra_unsigned;
+       int                     colorkey;
+       XvMCContext             context = {0};
+
+       display = XOpenDisplay(NULL);
+
+       if (!GetPort
+       (
+               display,
+               width,
+               height,
+               XVMC_CHROMA_FORMAT_420,
+               mc_types,
+               2,
+               &port_num,
+               &surface_type_id,
+               &is_overlay,
+               &intra_unsigned
+       ))
+       {
+               XCloseDisplay(display);
+               error(1, 0, "Error, unable to find a good port.\n");
+       }
+
+       if (is_overlay)
+       {
+               Atom xv_colorkey = XInternAtom(display, "XV_COLORKEY", 0);
+               XvGetPortAttribute(display, port_num, xv_colorkey, &colorkey);
+       }
+
+       /* Test NULL context */
+       /* XXX: XvMCBadContext not a valid return for XvMCCreateContext in the XvMC API, but openChrome driver returns it */
+       assert(XvMCCreateContext(display, port_num, surface_type_id, width, height, XVMC_DIRECT, NULL) == XvMCBadContext);
+       /* Test invalid port */
+       /* XXX: Success and XvBadPort have the same value, if this call actually gets passed the validation step as of now we'll crash later */
+       assert(XvMCCreateContext(display, -1, surface_type_id, width, height, XVMC_DIRECT, &context) == XvBadPort);
+       /* Test invalid surface */
+       assert(XvMCCreateContext(display, port_num, -1, width, height, XVMC_DIRECT, &context) == BadMatch);
+       /* Test invalid flags */
+       assert(XvMCCreateContext(display, port_num, surface_type_id, width, height, -1, &context) == BadValue);
+       /* Test huge width */
+       assert(XvMCCreateContext(display, port_num, surface_type_id, 16384, height, XVMC_DIRECT, &context) == BadValue);
+       /* Test huge height */
+       assert(XvMCCreateContext(display, port_num, surface_type_id, width, 16384, XVMC_DIRECT, &context) == BadValue);
+       /* Test huge width & height */
+       assert(XvMCCreateContext(display, port_num, surface_type_id, 16384, 16384, XVMC_DIRECT, &context) == BadValue);
+       /* Test valid params */
+       assert(XvMCCreateContext(display, port_num, surface_type_id, width, height, XVMC_DIRECT, &context) == Success);
+       /* Test context id assigned */
+       assert(context.context_id != 0);
+       /* Test surface type id assigned and correct */
+       assert(context.surface_type_id == surface_type_id);
+       /* Test width & height assigned and correct */
+       assert(context.width == width && context.height == height);
+       /* Test port assigned and correct */
+       assert(context.port == port_num);
+       /* Test flags assigned and correct */
+       assert(context.flags == XVMC_DIRECT);
+       /* Test NULL context */
+       assert(XvMCDestroyContext(display, NULL) == XvMCBadContext);
+       /* Test valid params */
+       assert(XvMCDestroyContext(display, &context) == Success);
+       /* Test awkward but valid width */
+       assert(XvMCCreateContext(display, port_num, surface_type_id, width + 1, height, XVMC_DIRECT, &context) == Success);
+       assert(context.width >= width + 1);
+       assert(XvMCDestroyContext(display, &context) == Success);
+       /* Test awkward but valid height */
+       assert(XvMCCreateContext(display, port_num, surface_type_id, width, height + 1, XVMC_DIRECT, &context) == Success);
+       assert(context.height >= height + 1);
+       assert(XvMCDestroyContext(display, &context) == Success);
+       /* Test awkward but valid width & height */
+       assert(XvMCCreateContext(display, port_num, surface_type_id, width + 1, height + 1, XVMC_DIRECT, &context) == Success);
+       assert(context.width >= width + 1 && context.height >= height + 1);
+       assert(XvMCDestroyContext(display, &context) == Success);
+
+       XvUngrabPort(display, port_num, CurrentTime);
+       XCloseDisplay(display);
+
+       return 0;
+}
diff --git a/src/xvmc/tests/test_rendering.c b/src/xvmc/tests/test_rendering.c
new file mode 100644 (file)
index 0000000..1e7467a
--- /dev/null
@@ -0,0 +1,287 @@
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <error.h>
+#include "testlib.h"
+
+#define BLOCK_WIDTH                    8
+#define BLOCK_HEIGHT                   8
+#define BLOCK_SIZE                     (BLOCK_WIDTH * BLOCK_HEIGHT)
+#define MACROBLOCK_WIDTH               16
+#define MACROBLOCK_HEIGHT              16
+#define MACROBLOCK_WIDTH_IN_BLOCKS     (MACROBLOCK_WIDTH / BLOCK_WIDTH)
+#define MACROBLOCK_HEIGHT_IN_BLOCKS    (MACROBLOCK_HEIGHT / BLOCK_HEIGHT)
+#define BLOCKS_PER_MACROBLOCK          6
+
+#define INPUT_WIDTH                    16
+#define INPUT_HEIGHT                   16
+#define INPUT_WIDTH_IN_MACROBLOCKS     (INPUT_WIDTH / MACROBLOCK_WIDTH)
+#define INPUT_HEIGHT_IN_MACROBLOCKS    (INPUT_HEIGHT / MACROBLOCK_HEIGHT)
+#define NUM_MACROBLOCKS                        (INPUT_WIDTH_IN_MACROBLOCKS * INPUT_HEIGHT_IN_MACROBLOCKS)
+
+#define DEFAULT_OUTPUT_WIDTH           INPUT_WIDTH
+#define DEFAULT_OUTPUT_HEIGHT          INPUT_HEIGHT
+#define DEFAULT_ACCEPTABLE_ERR         0.01
+
+void ParseArgs(int argc, char **argv, unsigned int *output_width, unsigned int *output_height, double *acceptable_error, int *prompt)
+{
+       int fail = 0;
+       int i;
+
+       *output_width = DEFAULT_OUTPUT_WIDTH;
+       *output_height = DEFAULT_OUTPUT_WIDTH;
+       *acceptable_error = DEFAULT_ACCEPTABLE_ERR;
+       *prompt = 1;
+
+       for (i = 1; i < argc && !fail; ++i)
+       {
+               if (!strcmp(argv[i], "-w"))
+               {
+                       if (sscanf(argv[++i], "%u", output_width) != 1)
+                               fail = 1;
+               }
+               else if (!strcmp(argv[i], "-h"))
+               {
+                       if (sscanf(argv[++i], "%u", output_height) != 1)
+                               fail = 1;
+               }
+               else if (!strcmp(argv[i], "-e"))
+               {
+                       if (sscanf(argv[++i], "%lf", acceptable_error) != 1)
+                               fail = 1;
+               }
+               else if (strcmp(argv[i], "-n"))
+                       *prompt = 0;
+               else
+                       fail = 1;
+       }
+
+       if (fail)
+               error
+               (
+                       1, 0,
+                       "Bad argument.\n"
+                       "\n"
+                       "Usage: %s [options]\n"
+                       "\t-w <width>\tOutput width\n"
+                       "\t-h <height>\tOutput height\n"
+                       "\t-e <error>\tAcceptable margin of error per pixel, from 0 to 1\n"
+                       "\t-n\tDon't prompt for quit\n",
+                       argv[0]
+               );
+}
+
+void Gradient(short *block, unsigned int start, unsigned int stop, int horizontal)
+{
+       unsigned int x, y;
+       unsigned int range = stop - start;
+
+       if (horizontal)
+       {
+               for (y = 0; y < BLOCK_HEIGHT; ++y)
+                       for (x = 0; x < BLOCK_WIDTH; ++x)
+                               block[y * BLOCK_WIDTH + x] = (short)(start + range * (x / (float)(BLOCK_WIDTH - 1)));
+       }
+       else
+       {
+               for (y = 0; y < BLOCK_HEIGHT; ++y)
+                       for (x = 0; x < BLOCK_WIDTH; ++x)
+                               block[y * BLOCK_WIDTH + x] = (short)(start + range * (y / (float)(BLOCK_HEIGHT - 1)));
+       }
+}
+
+int main(int argc, char **argv)
+{
+       unsigned int            output_width;
+       unsigned int            output_height;
+       double                  acceptable_error;
+       int                     prompt;
+       Display                 *display;
+       Window                  root, window;
+       const unsigned int      mc_types[2] = {XVMC_MOCOMP | XVMC_MPEG_2, XVMC_IDCT | XVMC_MPEG_2};
+       XvPortID                port_num;
+       int                     surface_type_id;
+       unsigned int            is_overlay, intra_unsigned;
+       int                     colorkey;
+       XvMCContext             context;
+       XvMCSurface             surface;
+       XvMCBlockArray          block_array;
+       XvMCMacroBlockArray     mb_array;
+       int                     mbx, mby, bx, by;
+       XvMCMacroBlock          *mb;
+       short                   *blocks;
+       int                     quit = 0;
+
+       ParseArgs(argc, argv, &output_width, &output_height, &acceptable_error, &prompt);
+
+       display = XOpenDisplay(NULL);
+
+       if (!GetPort
+       (
+               display,
+               INPUT_WIDTH,
+               INPUT_HEIGHT,
+               XVMC_CHROMA_FORMAT_420,
+               mc_types,
+               2,
+               &port_num,
+               &surface_type_id,
+               &is_overlay,
+               &intra_unsigned
+       ))
+       {
+               XCloseDisplay(display);
+               error(1, 0, "Error, unable to find a good port.\n");
+       }
+
+       if (is_overlay)
+       {
+               Atom xv_colorkey = XInternAtom(display, "XV_COLORKEY", 0);
+               XvGetPortAttribute(display, port_num, xv_colorkey, &colorkey);
+       }
+
+       root = XDefaultRootWindow(display);
+       window = XCreateSimpleWindow(display, root, 0, 0, output_width, output_height, 0, 0, colorkey);
+
+       assert(XvMCCreateContext(display, port_num, surface_type_id, INPUT_WIDTH, INPUT_HEIGHT, XVMC_DIRECT, &context) == Success);
+       assert(XvMCCreateSurface(display, &context, &surface) == Success);
+       assert(XvMCCreateBlocks(display, &context, NUM_MACROBLOCKS * BLOCKS_PER_MACROBLOCK, &block_array) == Success);
+       assert(XvMCCreateMacroBlocks(display, &context, NUM_MACROBLOCKS, &mb_array) == Success);
+
+       mb = mb_array.macro_blocks;
+       blocks = block_array.blocks;
+
+       for (mby = 0; mby < INPUT_HEIGHT_IN_MACROBLOCKS; ++mby)
+               for (mbx = 0; mbx < INPUT_WIDTH_IN_MACROBLOCKS; ++mbx)
+               {
+                       mb->x = mbx;
+                       mb->y = mby;
+                       mb->macroblock_type = XVMC_MB_TYPE_INTRA;
+                       /*mb->motion_type = ;*/
+                       /*mb->motion_vertical_field_select = ;*/
+                       mb->dct_type = XVMC_DCT_TYPE_FRAME;
+                       /*mb->PMV[0][0][0] = ;
+                       mb->PMV[0][0][1] = ;
+                       mb->PMV[0][1][0] = ;
+                       mb->PMV[0][1][1] = ;
+                       mb->PMV[1][0][0] = ;
+                       mb->PMV[1][0][1] = ;
+                       mb->PMV[1][1][0] = ;
+                       mb->PMV[1][1][1] = ;*/
+                       mb->index = (mby * INPUT_WIDTH_IN_MACROBLOCKS + mbx) * BLOCKS_PER_MACROBLOCK;
+                       mb->coded_block_pattern = 0x3F;
+
+                       mb++;
+
+                       for (by = 0; by < MACROBLOCK_HEIGHT_IN_BLOCKS; ++by)
+                               for (bx = 0; bx < MACROBLOCK_WIDTH_IN_BLOCKS; ++bx)
+                               {
+                                       const int start = 16, stop = 235, range = stop - start;
+
+                                       Gradient
+                                       (
+                                               blocks,
+                                               (short)(start + range * ((mbx * MACROBLOCK_WIDTH + bx * BLOCK_WIDTH) / (float)(INPUT_WIDTH - 1))),
+                                               (short)(start + range * ((mbx * MACROBLOCK_WIDTH + bx * BLOCK_WIDTH + BLOCK_WIDTH - 1) / (float)(INPUT_WIDTH - 1))),
+                                               1
+                                       );
+
+                                       blocks += BLOCK_SIZE;
+                               }
+
+                       for (by = 0; by < MACROBLOCK_HEIGHT_IN_BLOCKS / 2; ++by)
+                               for (bx = 0; bx < MACROBLOCK_WIDTH_IN_BLOCKS / 2; ++bx)
+                               {
+                                       const int start = 16, stop = 240, range = stop - start;
+
+                                       Gradient
+                                       (
+                                               blocks,
+                                               (short)(start + range * ((mbx * MACROBLOCK_WIDTH + bx * BLOCK_WIDTH) / (float)(INPUT_WIDTH - 1))),
+                                               (short)(start + range * ((mbx * MACROBLOCK_WIDTH + bx * BLOCK_WIDTH + BLOCK_WIDTH - 1) / (float)(INPUT_WIDTH - 1))),
+                                               1
+                                       );
+
+                                       blocks += BLOCK_SIZE;
+
+                                       Gradient
+                                       (
+                                               blocks,
+                                               (short)(start + range * ((mbx * MACROBLOCK_WIDTH + bx * BLOCK_WIDTH) / (float)(INPUT_WIDTH - 1))),
+                                               (short)(start + range * ((mbx * MACROBLOCK_WIDTH + bx * BLOCK_WIDTH + BLOCK_WIDTH - 1) / (float)(INPUT_WIDTH - 1))),
+                                               1
+                                       );
+
+                                       blocks += BLOCK_SIZE;
+                               }
+               }
+
+       XSelectInput(display, window, ExposureMask | KeyPressMask);
+       XMapWindow(display, window);
+       XSync(display, 0);
+
+       /* Test NULL context */
+       assert(XvMCRenderSurface(display, NULL, XVMC_FRAME_PICTURE, &surface, NULL, NULL, 0, NUM_MACROBLOCKS, 0, &mb_array, &block_array) == XvMCBadContext);
+       /* Test NULL surface */
+       assert(XvMCRenderSurface(display, &context, XVMC_FRAME_PICTURE, NULL, NULL, NULL, 0, NUM_MACROBLOCKS, 0, &mb_array, &block_array) == XvMCBadSurface);
+       /* Test bad picture structure */
+       assert(XvMCRenderSurface(display, &context, 0, &surface, NULL, NULL, 0, NUM_MACROBLOCKS, 0, &mb_array, &block_array) == BadValue);
+       /* Test valid params */
+       assert(XvMCRenderSurface(display, &context, XVMC_FRAME_PICTURE, &surface, NULL, NULL, 0, NUM_MACROBLOCKS, 0, &mb_array, &block_array) == Success);
+
+       /* Test NULL surface */
+       assert(XvMCPutSurface(display, NULL, window, 0, 0, INPUT_WIDTH, INPUT_HEIGHT, 0, 0, output_width, output_height, XVMC_FRAME_PICTURE) == XvMCBadSurface);
+       /* Test bad window */
+       /* XXX: X halts with a bad drawable for some reason, doesn't return BadDrawable as expected */
+       /*assert(XvMCPutSurface(display, &surface, 0, 0, 0, width, height, 0, 0, width, height, XVMC_FRAME_PICTURE) == BadDrawable);*/
+
+       if (prompt)
+       {
+               puts("Press any button to quit...");
+
+               while (!quit)
+               {
+                       if (XPending(display) > 0)
+                       {
+                               XEvent event;
+
+                               XNextEvent(display, &event);
+
+                               switch (event.type)
+                               {
+                                       case Expose:
+                                       {
+                                               /* Test valid params */
+                                               assert
+                                               (
+                                                       XvMCPutSurface
+                                                       (
+                                                               display, &surface, window,
+                                                               0, 0, INPUT_WIDTH, INPUT_HEIGHT,
+                                                               0, 0, output_width, output_height,
+                                                               XVMC_FRAME_PICTURE
+                                                       ) == Success
+                                               );
+                                               break;
+                                       }
+                                       case KeyPress:
+                                       {
+                                               quit = 1;
+                                               break;
+                                       }
+                               }
+                       }
+               }
+       }
+
+       assert(XvMCDestroyBlocks(display, &block_array) == Success);
+       assert(XvMCDestroyMacroBlocks(display, &mb_array) == Success);
+       assert(XvMCDestroySurface(display, &surface) == Success);
+       assert(XvMCDestroyContext(display, &context) == Success);
+
+       XvUngrabPort(display, port_num, CurrentTime);
+       XDestroyWindow(display, window);
+       XCloseDisplay(display);
+
+       return 0;
+}
diff --git a/src/xvmc/tests/test_surface.c b/src/xvmc/tests/test_surface.c
new file mode 100644 (file)
index 0000000..25ebdcc
--- /dev/null
@@ -0,0 +1,72 @@
+#include <assert.h>
+#include <error.h>
+#include "testlib.h"
+
+int main(int argc, char **argv)
+{
+       const unsigned int      width = 16, height = 16;
+       const unsigned int      mc_types[2] = {XVMC_MOCOMP | XVMC_MPEG_2, XVMC_IDCT | XVMC_MPEG_2};
+       
+       Display                 *display;
+       XvPortID                port_num;
+       int                     surface_type_id;
+       unsigned int            is_overlay, intra_unsigned;
+       int                     colorkey;
+       XvMCContext             context;
+       XvMCSurface             surface = {0};
+       
+       display = XOpenDisplay(NULL);
+       
+       if (!GetPort
+       (
+               display,
+               width,
+               height,
+               XVMC_CHROMA_FORMAT_420,
+               mc_types,
+               2,
+               &port_num,
+               &surface_type_id,
+               &is_overlay,
+               &intra_unsigned
+       ))
+       {
+               XCloseDisplay(display);
+               error(1, 0, "Error, unable to find a good port.\n");
+       }
+       
+       if (is_overlay)
+       {
+               Atom xv_colorkey = XInternAtom(display, "XV_COLORKEY", 0);
+               XvGetPortAttribute(display, port_num, xv_colorkey, &colorkey);
+       }
+       
+       assert(XvMCCreateContext(display, port_num, surface_type_id, width, height, XVMC_DIRECT, &context) == Success);
+       
+       /* Test NULL context */
+       assert(XvMCCreateSurface(display, NULL, &surface) == XvMCBadContext);
+       /* Test NULL surface */
+       assert(XvMCCreateSurface(display, &context, NULL) == XvMCBadSurface);
+       /* Test valid params */
+       assert(XvMCCreateSurface(display, &context, &surface) == Success);
+       /* Test surface id assigned */
+       assert(surface.surface_id != 0);
+       /* Test context id assigned and correct */
+       assert(surface.context_id == context.context_id);
+       /* Test surface type id assigned and correct */
+       assert(surface.surface_type_id == surface_type_id);
+       /* Test width & height assigned and correct */
+       assert(surface.width == width && surface.height == height);
+       /* Test valid params */
+       assert(XvMCDestroySurface(display, &surface) == Success);
+       /* Test NULL surface */
+       assert(XvMCDestroySurface(display, NULL) == XvMCBadSurface);
+       
+       assert(XvMCDestroyContext(display, &context) == Success);
+       
+       XvUngrabPort(display, port_num, CurrentTime);
+       XCloseDisplay(display);
+       
+       return 0;
+}
+
diff --git a/src/xvmc/tests/testlib.c b/src/xvmc/tests/testlib.c
new file mode 100644 (file)
index 0000000..59a03ca
--- /dev/null
@@ -0,0 +1,119 @@
+#include "testlib.h"
+#include <stdio.h>
+
+/*
+void test(int pred, const char *pred_string, const char *doc_string, const char *file, unsigned int line)
+{
+       fputs(doc_string, stderr);
+       if (!pred)
+               fprintf(stderr, " FAIL!\n\t\"%s\" at %s:%u\n", pred_string, file, line);
+       else
+               fputs(" PASS!\n", stderr);
+}
+*/
+
+int GetPort
+(
+       Display *display,
+       unsigned int width,
+       unsigned int height,
+       unsigned int chroma_format,
+       const unsigned int *mc_types,
+       unsigned int num_mc_types,
+       XvPortID *port_id,
+       int *surface_type_id,
+       unsigned int *is_overlay,
+       unsigned int *intra_unsigned
+)
+{
+       unsigned int    found_port = 0;
+       XvAdaptorInfo   *adaptor_info;
+       unsigned int    num_adaptors;
+       int             num_types;
+       int             ev_base, err_base;
+       unsigned int    i, j, k, l;
+
+       if (!XvMCQueryExtension(display, &ev_base, &err_base))
+               return 0;
+       if (XvQueryAdaptors(display, XDefaultRootWindow(display), &num_adaptors, &adaptor_info) != Success)
+               return 0;
+
+       for (i = 0; i < num_adaptors && !found_port; ++i)
+       {
+               if (adaptor_info[i].type & XvImageMask)
+               {
+                       XvMCSurfaceInfo *surface_info = XvMCListSurfaceTypes(display, adaptor_info[i].base_id, &num_types);
+
+                       if (surface_info)
+                       {
+                               for (j = 0; j < num_types && !found_port; ++j)
+                               {
+                                       if
+                                       (
+                                               surface_info[j].chroma_format == chroma_format &&
+                                               surface_info[j].max_width >= width &&
+                                               surface_info[j].max_height >= height
+                                       )
+                                       {
+                                               for (k = 0; k < num_mc_types && !found_port; ++k)
+                                               {
+                                                       if (surface_info[j].mc_type == mc_types[k])
+                                                       {
+                                                               for (l = 0; l < adaptor_info[i].num_ports && !found_port; ++l)
+                                                               {
+                                                                       if (XvGrabPort(display, adaptor_info[i].base_id + l, CurrentTime) == Success)
+                                                                       {
+                                                                               *port_id = adaptor_info[i].base_id + l;
+                                                                               *surface_type_id = surface_info[j].surface_type_id;
+                                                                               *is_overlay = surface_info[j].flags & XVMC_OVERLAID_SURFACE;
+                                                                               *intra_unsigned = surface_info[j].flags & XVMC_INTRA_UNSIGNED;
+                                                                               found_port = 1;
+                                                                       }
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
+
+                               XFree(surface_info);
+                       }
+               }
+       }
+
+       XvFreeAdaptorInfo(adaptor_info);
+
+       return found_port;
+}
+
+unsigned int align(unsigned int value, unsigned int alignment)
+{
+       return (value + alignment - 1) & ~(alignment - 1);
+}
+
+/* From the glibc manual */
+int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y)
+{
+       /* Perform the carry for the later subtraction by updating y. */
+       if (x->tv_usec < y->tv_usec)
+       {
+               int nsec = (y->tv_usec - x->tv_usec) / 1000000 + 1;
+               y->tv_usec -= 1000000 * nsec;
+               y->tv_sec += nsec;
+       }
+       if (x->tv_usec - y->tv_usec > 1000000)
+       {
+               int nsec = (x->tv_usec - y->tv_usec) / 1000000;
+               y->tv_usec += 1000000 * nsec;
+               y->tv_sec -= nsec;
+       }
+
+       /*
+        * Compute the time remaining to wait.
+        * tv_usec is certainly positive.
+        */
+       result->tv_sec = x->tv_sec - y->tv_sec;
+       result->tv_usec = x->tv_usec - y->tv_usec;
+
+       /* Return 1 if result is negative. */
+       return x->tv_sec < y->tv_sec;
+}
diff --git a/src/xvmc/tests/testlib.h b/src/xvmc/tests/testlib.h
new file mode 100644 (file)
index 0000000..af71ad7
--- /dev/null
@@ -0,0 +1,42 @@
+#ifndef testlib_h
+#define testlib_h
+
+/*
+#define TEST(pred, doc)        test(pred, #pred, doc, __FILE__, __LINE__)
+
+void test(int pred, const char *pred_string, const char *doc_string, const char *file, unsigned int line);
+*/
+
+#include <sys/time.h>
+#include <X11/Xlib.h>
+#include <X11/extensions/XvMClib.h>
+
+/*
+ * display: IN                 A valid X display
+ * width, height: IN           Surface size that the port must display
+ * chroma_format: IN           Chroma format that the port must display
+ * mc_types, num_mc_types: IN  List of MC types that the port must support, first port that matches the first mc_type will be returned
+ * port_id: OUT                        Your port's ID
+ * surface_type_id: OUT                Your port's surface ID
+ * is_overlay: OUT             If 1, port uses overlay surfaces, you need to set a colorkey
+ * intra_unsigned: OUT         If 1, port uses unsigned values for intra-coded blocks
+ */
+int GetPort
+(
+       Display *display,
+       unsigned int width,
+       unsigned int height,
+       unsigned int chroma_format,
+       const unsigned int *mc_types,
+       unsigned int num_mc_types,
+       XvPortID *port_id,
+       int *surface_type_id,
+       unsigned int *is_overlay,
+       unsigned int *intra_unsigned
+);
+
+unsigned int align(unsigned int value, unsigned int alignment);
+
+int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y);
+
+#endif
diff --git a/src/xvmc/tests/xvmc_bench.c b/src/xvmc/tests/xvmc_bench.c
new file mode 100644 (file)
index 0000000..d5a39ec
--- /dev/null
@@ -0,0 +1,271 @@
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <error.h>
+#include <sys/time.h>
+#include "testlib.h"
+
+#define MACROBLOCK_WIDTH               16
+#define MACROBLOCK_HEIGHT              16
+#define BLOCKS_PER_MACROBLOCK          6
+
+#define DEFAULT_INPUT_WIDTH            720
+#define DEFAULT_INPUT_HEIGHT           480
+#define DEFAULT_REPS                   100
+
+#define PIPELINE_STEP_MC               1
+#define PIPELINE_STEP_CSC              2
+#define PIPELINE_STEP_SWAP             4
+
+#define MB_TYPE_I                      1
+#define MB_TYPE_P                      2
+#define MB_TYPE_B                      4
+
+struct Config
+{
+       unsigned int input_width;
+       unsigned int input_height;
+       unsigned int output_width;
+       unsigned int output_height;
+       unsigned int pipeline;
+       unsigned int mb_types;
+       unsigned int reps;
+};
+
+void ParseArgs(int argc, char **argv, struct Config *config)
+{
+       int fail = 0;
+       int i;
+
+       config->input_width = DEFAULT_INPUT_WIDTH;
+       config->input_height = DEFAULT_INPUT_HEIGHT;
+       config->output_width = 0;
+       config->output_height = 0;
+       config->pipeline = 0;
+       config->mb_types = 0;
+       config->reps = DEFAULT_REPS;
+
+       for (i = 1; i < argc && !fail; ++i)
+       {
+               if (!strcmp(argv[i], "-iw"))
+               {
+                       if (sscanf(argv[++i], "%u", &config->input_width) != 1)
+                               fail = 1;
+               }
+               else if (!strcmp(argv[i], "-ih"))
+               {
+                       if (sscanf(argv[++i], "%u", &config->input_height) != 1)
+                               fail = 1;
+               }
+               else if (!strcmp(argv[i], "-ow"))
+               {
+                       if (sscanf(argv[++i], "%u", &config->output_width) != 1)
+                               fail = 1;
+               }
+               else if (!strcmp(argv[i], "-oh"))
+               {
+                       if (sscanf(argv[++i], "%u", &config->output_height) != 1)
+                               fail = 1;
+               }
+               else if (!strcmp(argv[i], "-p"))
+               {
+                       char *token = strtok(argv[++i], ",");
+
+                       while (token && !fail)
+                       {
+                               if (!strcmp(token, "mc"))
+                                       config->pipeline |= PIPELINE_STEP_MC;
+                               else if (!strcmp(token, "csc"))
+                                       config->pipeline |= PIPELINE_STEP_CSC;
+                               else if (!strcmp(token, "swp"))
+                                       config->pipeline |= PIPELINE_STEP_SWAP;
+                               else
+                                       fail = 1;
+
+                               if (!fail)
+                                       token = strtok(NULL, ",");
+                       }
+               }
+               else if (!strcmp(argv[i], "-mb"))
+               {
+                       char *token = strtok(argv[++i], ",");
+
+                       while (token && !fail)
+                       {
+                               if (strcmp(token, "i"))
+                                       config->mb_types |= MB_TYPE_I;
+                               else if (strcmp(token, "p"))
+                                       config->mb_types |= MB_TYPE_P;
+                               else if (strcmp(token, "b"))
+                                       config->mb_types |= MB_TYPE_B;
+                               else
+                                       fail = 1;
+
+                               if (!fail)
+                                       token = strtok(NULL, ",");
+                       }
+               }
+               else if (!strcmp(argv[i], "-r"))
+               {
+                       if (sscanf(argv[++i], "%u", &config->reps) != 1)
+                               fail = 1;
+               }
+               else
+                       fail = 1;
+       }
+
+       if (fail)
+               error
+               (
+                       1, 0,
+                       "Bad argument.\n"
+                       "\n"
+                       "Usage: %s [options]\n"
+                       "\t-iw <width>\tInput width\n"
+                       "\t-ih <height>\tInput height\n"
+                       "\t-ow <width>\tOutput width\n"
+                       "\t-oh <height>\tOutput height\n"
+                       "\t-p <pipeline>\tPipeline to test\n"
+                       "\t-mb <mb type>\tMacroBlock types to use\n"
+                       "\t-r <reps>\tRepetitions\n\n"
+                       "\tPipeline steps: mc,csc,swap\n"
+                       "\tMB types: i,p,b\n",
+                       argv[0]
+               );
+
+       if (config->output_width == 0)
+               config->output_width = config->input_width;
+       if (config->output_height == 0)
+               config->output_height = config->input_height;
+       if (!config->pipeline)
+               config->pipeline = PIPELINE_STEP_MC | PIPELINE_STEP_CSC | PIPELINE_STEP_SWAP;
+       if (!config->mb_types)
+               config->mb_types = MB_TYPE_I | MB_TYPE_P | MB_TYPE_B;
+}
+
+int main(int argc, char **argv)
+{
+       struct Config           config;
+       Display                 *display;
+       Window                  root, window;
+       const unsigned int      mc_types[2] = {XVMC_MOCOMP | XVMC_MPEG_2, XVMC_IDCT | XVMC_MPEG_2};
+       XvPortID                port_num;
+       int                     surface_type_id;
+       unsigned int            is_overlay, intra_unsigned;
+       int                     colorkey;
+       XvMCContext             context;
+       XvMCSurface             surface;
+       XvMCBlockArray          block_array;
+       XvMCMacroBlockArray     mb_array;
+       unsigned int            mbw, mbh;
+       unsigned int            mbx, mby;
+       unsigned int            reps;
+       struct timeval          start, stop, diff;
+       double                  diff_secs;
+
+       ParseArgs(argc, argv, &config);
+
+       mbw = align(config.input_width, MACROBLOCK_WIDTH) / MACROBLOCK_WIDTH;
+       mbh = align(config.input_height, MACROBLOCK_HEIGHT) / MACROBLOCK_HEIGHT;
+
+       display = XOpenDisplay(NULL);
+
+       if (!GetPort
+       (
+               display,
+               config.input_width,
+               config.input_height,
+               XVMC_CHROMA_FORMAT_420,
+               mc_types,
+               2,
+               &port_num,
+               &surface_type_id,
+               &is_overlay,
+               &intra_unsigned
+       ))
+       {
+               XCloseDisplay(display);
+               error(1, 0, "Error, unable to find a good port.\n");
+       }
+
+       if (is_overlay)
+       {
+               Atom xv_colorkey = XInternAtom(display, "XV_COLORKEY", 0);
+               XvGetPortAttribute(display, port_num, xv_colorkey, &colorkey);
+       }
+
+       root = XDefaultRootWindow(display);
+       window = XCreateSimpleWindow(display, root, 0, 0, config.output_width, config.output_height, 0, 0, colorkey);
+
+       assert(XvMCCreateContext(display, port_num, surface_type_id, config.input_width, config.input_height, XVMC_DIRECT, &context) == Success);
+       assert(XvMCCreateSurface(display, &context, &surface) == Success);
+       assert(XvMCCreateBlocks(display, &context, mbw * mbh * BLOCKS_PER_MACROBLOCK, &block_array) == Success);
+       assert(XvMCCreateMacroBlocks(display, &context, mbw * mbh, &mb_array) == Success);
+
+       for (mby = 0; mby < mbh; ++mby)
+               for (mbx = 0; mbx < mbw; ++mbx)
+               {
+                       mb_array.macro_blocks[mby * mbw + mbx].x = mbx;
+                       mb_array.macro_blocks[mby * mbw + mbx].y = mby;
+                       mb_array.macro_blocks[mby * mbw + mbx].macroblock_type = XVMC_MB_TYPE_INTRA;
+                       /*mb->motion_type = ;*/
+                       /*mb->motion_vertical_field_select = ;*/
+                       mb_array.macro_blocks[mby * mbw + mbx].dct_type = XVMC_DCT_TYPE_FRAME;
+                       /*mb->PMV[0][0][0] = ;
+                       mb->PMV[0][0][1] = ;
+                       mb->PMV[0][1][0] = ;
+                       mb->PMV[0][1][1] = ;
+                       mb->PMV[1][0][0] = ;
+                       mb->PMV[1][0][1] = ;
+                       mb->PMV[1][1][0] = ;
+                       mb->PMV[1][1][1] = ;*/
+                       mb_array.macro_blocks[mby * mbw + mbx].index = (mby * mbw + mbx) * BLOCKS_PER_MACROBLOCK;
+                       mb_array.macro_blocks[mby * mbw + mbx].coded_block_pattern = 0x3F;
+               }
+
+       XSelectInput(display, window, ExposureMask | KeyPressMask);
+       XMapWindow(display, window);
+       XSync(display, 0);
+
+       gettimeofday(&start, NULL);
+
+       for (reps = 0; reps < config.reps; ++reps)
+       {
+               if (config.pipeline & PIPELINE_STEP_MC)
+               {
+                       assert(XvMCRenderSurface(display, &context, XVMC_FRAME_PICTURE, &surface, NULL, NULL, 0, mbw * mbh, 0, &mb_array, &block_array) == Success);
+                       assert(XvMCFlushSurface(display, &surface) == Success);
+               }
+               if (config.pipeline & PIPELINE_STEP_CSC)
+                       assert(XvMCPutSurface(display, &surface, window, 0, 0, config.input_width, config.input_height, 0, 0, config.output_width, config.output_height, XVMC_FRAME_PICTURE) == Success);
+       }
+
+       gettimeofday(&stop, NULL);
+
+       timeval_subtract(&diff, &stop, &start);
+       diff_secs = (double)diff.tv_sec + (double)diff.tv_usec / 1000000.0;
+
+       printf("XvMC Benchmark\n");
+       printf("Input: %u,%u\nOutput: %u,%u\n", config.input_width, config.input_height, config.output_width, config.output_height);
+       printf("Pipeline: ");
+       if (config.pipeline & PIPELINE_STEP_MC)
+               printf("|mc|");
+       if (config.pipeline & PIPELINE_STEP_CSC)
+               printf("|csc|");
+       if (config.pipeline & PIPELINE_STEP_SWAP)
+               printf("|swap|");
+       printf("\n");
+       printf("Reps: %u\n", config.reps);
+       printf("Total time: %.2lf (%.2lf reps / sec)\n", diff_secs, config.reps / diff_secs);
+
+       assert(XvMCDestroyBlocks(display, &block_array) == Success);
+       assert(XvMCDestroyMacroBlocks(display, &mb_array) == Success);
+       assert(XvMCDestroySurface(display, &surface) == Success);
+       assert(XvMCDestroyContext(display, &context) == Success);
+
+       XvUngrabPort(display, port_num, CurrentTime);
+       XDestroyWindow(display, window);
+       XCloseDisplay(display);
+
+       return 0;
+}