Mercurial > sdl-ios-xcode
view src/video/Xext/extensions/Xvlib.h @ 4447:947201caa46e
Added automated test to Xcode project plus needed changes to SDL_RWFromFile to be OS X bundle aware.
The Mac OS X project has a new target called testsdl which builds the automated test. I looked at using Xcode's native unit test support, but the impedance mismatch between the existing automated test structure and Apple's was more than I could handle.
As such, the testsdl application is a full blown proper OS X application, which means it is a self-contained .app bundle. This immediately revealed some problems from the automated test. The largest problem was the assumption about the current working directory and where to find resources. (I suspect Windows may have a similar problem depending on circumstance.) To open resources, the test was looking in directories relative to the SDL source directory, but this will not work well with self-contained .app bundles and Xcode which can place its built applications almost anywhere. And for real-world situations, this is pretty useless anyway.
So I modified SDL_RWFromFile to do special things on OS X. First, it will look for a file in the .app bundle. If not found, it will fallback and just call fopen as it used to do.
I also had to modify the automated test itself because it had a contrieved test which called fopen directly to do read from an existing FILE pointer. In addition, there was a write test. Since a .app bundle is likely going to be read-only, I added a special case for OS X to write to NSTemporaryDirectory.
I expect these changes should work for both Mac and iPhone OS (which includes iPad).
I will update the iPhone Xcode project next.
Finally, FYI, the X11 automated test seems to be failing. Below is my output.
Pending breakpoint 4 - "-[NSException raise]" resolved
Platform : All tests successful (2)
SDL_RWops : All tests successful (5)
Rect : All tests successful (1)
SDL_Surface : All tests successful (6)
Rendering with cocoa driver : All tests successful (3)
Assert Failed!
Blit output not the same.
Test Case 'Renderer x11'
Test Suite 'Rendering with x11 driver'
Last SDL error ''
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetSurfaceBounds
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorFailure: Set a breakpoint @ CGErrorBreakpoint() to catch errors as they are logged.
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetWindowBounds
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetSurfaceBounds
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetWindowBounds
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetSurfaceBounds
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetWindowBounds
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetSurfaceBounds
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetWindowBounds
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetSurfaceBounds
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetWindowBounds
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetSurfaceBounds
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetWindowBounds
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetSurfaceBounds
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150
Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150
Rendering with x11 driver : Failed 1 out of 4 testcases!
Rendering with dummy driver : All tests successful (3)
SDL_Audio : All tests successful (1)
Tests run with SDL 1.3.0 revision 1095906
System is running Mac OS X and is little endian
| author | Eric Wing <ewing . public |-at-| gmail . com> |
|---|---|
| date | Sat, 08 May 2010 00:54:22 -0700 |
| parents | c121d94672cb |
| children |
line wrap: on
line source
/*********************************************************** Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts. All Rights Reserved Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the names of Digital or MIT not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ /* $XFree86: xc/include/extensions/Xvlib.h,v 1.3 1999/12/11 19:28:48 mvojkovi Exp $ */ #ifndef XVLIB_H #define XVLIB_H /* ** File: ** ** Xvlib.h --- Xv library public header file ** ** Author: ** ** David Carver (Digital Workstation Engineering/Project Athena) ** ** Revisions: ** ** 26.06.91 Carver ** - changed XvFreeAdaptors to XvFreeAdaptorInfo ** - changed XvFreeEncodings to XvFreeEncodingInfo ** ** 11.06.91 Carver ** - changed SetPortControl to SetPortAttribute ** - changed GetPortControl to GetPortAttribute ** - changed QueryBestSize ** ** 05.15.91 Carver ** - version 2.0 upgrade ** ** 01.24.91 Carver ** - version 1.4 upgrade ** */ #include <X11/Xfuncproto.h> #include "Xv.h" #include "SDL_name.h" typedef struct { int numerator; int denominator; } SDL_NAME(XvRational); typedef struct { int flags; /* XvGettable, XvSettable */ int min_value; int max_value; char *name; } SDL_NAME(XvAttribute); typedef struct { XvEncodingID encoding_id; char *name; unsigned long width; unsigned long height; SDL_NAME(XvRational) rate; unsigned long num_encodings; } SDL_NAME(XvEncodingInfo); typedef struct { char depth; unsigned long visual_id; } SDL_NAME(XvFormat); typedef struct { XvPortID base_id; unsigned long num_ports; char type; char *name; unsigned long num_formats; SDL_NAME(XvFormat) * formats; unsigned long num_adaptors; } SDL_NAME(XvAdaptorInfo); typedef struct { int type; unsigned long serial; /* # of last request processed by server */ Bool send_event; /* true if this came from a SendEvent request */ Display *display; /* Display the event was read from */ Drawable drawable; /* drawable */ unsigned long reason; /* what generated this event */ XvPortID port_id; /* what port */ Time time; /* milliseconds */ } SDL_NAME(XvVideoNotifyEvent); typedef struct { int type; unsigned long serial; /* # of last request processed by server */ Bool send_event; /* true if this came from a SendEvent request */ Display *display; /* Display the event was read from */ XvPortID port_id; /* what port */ Time time; /* milliseconds */ Atom attribute; /* atom that identifies attribute */ long value; /* value of attribute */ } SDL_NAME(XvPortNotifyEvent); typedef union { int type; SDL_NAME(XvVideoNotifyEvent) xvvideo; SDL_NAME(XvPortNotifyEvent) xvport; long pad[24]; } SDL_NAME(XvEvent); typedef struct { int id; /* Unique descriptor for the format */ int type; /* XvRGB, XvYUV */ int byte_order; /* LSBFirst, MSBFirst */ char guid[16]; /* Globally Unique IDentifier */ int bits_per_pixel; int format; /* XvPacked, XvPlanar */ int num_planes; /* for RGB formats only */ int depth; unsigned int red_mask; unsigned int green_mask; unsigned int blue_mask; /* for YUV formats only */ unsigned int y_sample_bits; unsigned int u_sample_bits; unsigned int v_sample_bits; unsigned int horz_y_period; unsigned int horz_u_period; unsigned int horz_v_period; unsigned int vert_y_period; unsigned int vert_u_period; unsigned int vert_v_period; char component_order[32]; /* eg. UYVY */ int scanline_order; /* XvTopToBottom, XvBottomToTop */ } SDL_NAME(XvImageFormatValues); typedef struct { int id; int width, height; int data_size; /* bytes */ int num_planes; int *pitches; /* bytes */ int *offsets; /* bytes */ char *data; XPointer obdata; } SDL_NAME(XvImage); _XFUNCPROTOBEGIN extern int SDL_NAME(XvQueryExtension) ( #if NeedFunctionPrototypes Display * /* display */ , unsigned int * /* p_version */ , unsigned int * /* p_revision */ , unsigned int * /* p_requestBase */ , unsigned int * /* p_eventBase */ , unsigned int * /* p_errorBase */ #endif ); extern int SDL_NAME(XvQueryAdaptors) ( #if NeedFunctionPrototypes Display * /* display */ , Window /* window */ , unsigned int * /* p_nAdaptors */ , SDL_NAME(XvAdaptorInfo) ** /* p_pAdaptors */ #endif ); extern int SDL_NAME(XvQueryEncodings) ( #if NeedFunctionPrototypes Display * /* display */ , XvPortID /* port */ , unsigned int * /* p_nEncoding */ , SDL_NAME(XvEncodingInfo) ** /* p_pEncoding */ #endif ); extern int SDL_NAME(XvPutVideo) ( #if NeedFunctionPrototypes Display * /* display */ , XvPortID /* port */ , Drawable /* d */ , GC /* gc */ , int /* vx */ , int /* vy */ , unsigned int /* vw */ , unsigned int /* vh */ , int /* dx */ , int /* dy */ , unsigned int /* dw */ , unsigned int /* dh */ #endif ); extern int SDL_NAME(XvPutStill) ( #if NeedFunctionPrototypes Display * /* display */ , XvPortID /* port */ , Drawable /* d */ , GC /* gc */ , int /* vx */ , int /* vy */ , unsigned int /* vw */ , unsigned int /* vh */ , int /* dx */ , int /* dy */ , unsigned int /* dw */ , unsigned int /* dh */ #endif ); extern int SDL_NAME(XvGetVideo) ( #if NeedFunctionPrototypes Display * /* display */ , XvPortID /* port */ , Drawable /* d */ , GC /* gc */ , int /* vx */ , int /* vy */ , unsigned int /* vw */ , unsigned int /* vh */ , int /* dx */ , int /* dy */ , unsigned int /* dw */ , unsigned int /* dh */ #endif ); extern int SDL_NAME(XvGetStill) ( #if NeedFunctionPrototypes Display * /* display */ , XvPortID /* port */ , Drawable /* d */ , GC /* gc */ , int /* vx */ , int /* vy */ , unsigned int /* vw */ , unsigned int /* vh */ , int /* dx */ , int /* dy */ , unsigned int /* dw */ , unsigned int /* dh */ #endif ); extern int SDL_NAME(XvStopVideo) ( #if NeedFunctionPrototypes Display * /* display */ , XvPortID /* port */ , Drawable /* drawable */ #endif ); extern int SDL_NAME(XvGrabPort) ( #if NeedFunctionPrototypes Display * /* display */ , XvPortID /* port */ , Time /* time */ #endif ); extern int SDL_NAME(XvUngrabPort) ( #if NeedFunctionPrototypes Display * /* display */ , XvPortID /* port */ , Time /* time */ #endif ); extern int SDL_NAME(XvSelectVideoNotify) ( #if NeedFunctionPrototypes Display * /* display */ , Drawable /* drawable */ , Bool /* onoff */ #endif ); extern int SDL_NAME(XvSelectPortNotify) ( #if NeedFunctionPrototypes Display * /* display */ , XvPortID /* port */ , Bool /* onoff */ #endif ); extern int SDL_NAME(XvSetPortAttribute) ( #if NeedFunctionPrototypes Display * /* display */ , XvPortID /* port */ , Atom /* attribute */ , int /* value */ #endif ); extern int SDL_NAME(XvGetPortAttribute) ( #if NeedFunctionPrototypes Display * /* display */ , XvPortID /* port */ , Atom /* attribute */ , int * /* p_value */ #endif ); extern int SDL_NAME(XvQueryBestSize) ( #if NeedFunctionPrototypes Display * /* display */ , XvPortID /* port */ , Bool /* motion */ , unsigned int /* vid_w */ , unsigned int /* vid_h */ , unsigned int /* drw_w */ , unsigned int /* drw_h */ , unsigned int * /* p_actual_width */ , unsigned int * /* p_actual_width */ #endif ); extern SDL_NAME(XvAttribute) * SDL_NAME(XvQueryPortAttributes) ( #if NeedFunctionPrototypes Display * /* display */ , XvPortID /* port */ , int * /* number */ #endif ); extern void SDL_NAME(XvFreeAdaptorInfo) ( #if NeedFunctionPrototypes SDL_NAME(XvAdaptorInfo) * /* adaptors */ #endif ); extern void SDL_NAME(XvFreeEncodingInfo) ( #if NeedFunctionPrototypes SDL_NAME(XvEncodingInfo) * /* encodings */ #endif ); extern SDL_NAME(XvImageFormatValues) * SDL_NAME(XvListImageFormats) ( #if NeedFunctionPrototypes Display * display, XvPortID port_id, int *count_return #endif ); extern SDL_NAME(XvImage) * SDL_NAME(XvCreateImage) ( #if NeedFunctionPrototypes Display * display, XvPortID port, int id, char *data, int width, int height #endif ); extern int SDL_NAME(XvPutImage) ( #if NeedFunctionPrototypes Display * display, XvPortID id, Drawable d, GC gc, SDL_NAME(XvImage) * image, int src_x, int src_y, unsigned int src_w, unsigned int src_h, int dest_x, int dest_y, unsigned int dest_w, unsigned int dest_h #endif ); extern int SDL_NAME(XvShmPutImage) ( #if NeedFunctionPrototypes Display * display, XvPortID id, Drawable d, GC gc, SDL_NAME(XvImage) * image, int src_x, int src_y, unsigned int src_w, unsigned int src_h, int dest_x, int dest_y, unsigned int dest_w, unsigned int dest_h, Bool send_event #endif ); #ifdef _XSHM_H_ extern SDL_NAME(XvImage) * SDL_NAME(XvShmCreateImage) ( #if NeedFunctionPrototypes Display * display, XvPortID port, int id, char *data, int width, int height, XShmSegmentInfo * shminfo #endif ); #endif _XFUNCPROTOEND #endif /* XVLIB_H */ /* vi: set ts=4 sw=4 expandtab: */