summaryrefslogtreecommitdiffstats
path: root/vidix
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-01-23 19:30:26 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-01-23 19:30:26 +0000
commitbb37a1a5ab725cbbf5463512dd02b680b770fb94 (patch)
tree82f18251f469c88013f136ef16d8d6898a04a4df /vidix
parenta5a2bec673488849fedc44bdf296ff33c8e3dcfe (diff)
downloadmpv-bb37a1a5ab725cbbf5463512dd02b680b770fb94.tar.bz2
mpv-bb37a1a5ab725cbbf5463512dd02b680b770fb94.tar.xz
some typos fixed ;), added author to capabilites and extended name to 64 bytes. added interleaved uv planes support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4324 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix')
-rw-r--r--vidix/vidix.h17
1 files changed, 11 insertions, 6 deletions
diff --git a/vidix/vidix.h b/vidix/vidix.h
index 10e97cbbbf..0ddc7b124f 100644
--- a/vidix/vidix.h
+++ b/vidix/vidix.h
@@ -40,7 +40,8 @@ extern void vixDestroy( void );
typedef struct vidix_capability_s
{
- char name[32]; /* Driver name */
+ char name[64]; /* Driver name */
+ char author[64]; /* Author name */
#define TYPE_OUTPUT 0x00000000 /* Is a video playback device */
#define TYPE_CAPTURE 0x00000001 /* Is a capture device */
#define TYPE_CODEC 0x00000002 /* Device supports hw (de)coding */
@@ -62,7 +63,7 @@ typedef struct vidix_capability_s
unsigned flags; /* Feature flags, see above */
unsigned short vendor_id;
unsigned short device_id;
- unsigned reserved[4];
+ unsigned reserved1[4];
}vidix_capability_t;
/* Should fill at least type before init.
@@ -139,14 +140,18 @@ typedef struct vidix_playback_s
{
unsigned fourcc; /* app -> driver: movies's fourcc */
unsigned capability; /* app -> driver: what capability to use */
- unsigned blend_factor; /* app -> driver: blenfing factor */
+ unsigned blend_factor; /* app -> driver: blending factor */
vidix_rect_t src; /* app -> driver: original movie size */
vidix_rect_t dest; /* app -> driver: destinition movie size. driver->app dest_pitch */
+#define VID_PLAY_INTERLEAVED_UV 0x00000001 /* driver -> app: interleaved UV planes */
+#define INTERLEAVING_UV 0x00001000 /* UVUVUVUVUV used by Matrox G200 */
+#define INTERLEAVING_VU 0x00001001 /* VUVUVUVUVU */
+ int flags;
/* memory model */
- unsigned frame_size; /* driver -> app; destinition frame size */
+ unsigned frame_size; /* driver -> app: destinition frame size */
unsigned num_frames; /* app -> driver: after call: driver -> app */
-#define LVO_MAXFRAMES 32
- unsigned offsets[LVO_MAXFRAMES]; /* driver -> app */
+#define VID_PLAY_MAXFRAMES 32
+ unsigned offsets[VID_PLAY_MAXFRAMES]; /* driver -> app */
vidix_yuv_t offset; /* driver -> app: relative offsets within frame for yuv planes */
void* dga_addr; /* driver -> app: linear address */
}vidix_playback_t;