annotate libmpcodecs/vd_xanim.c @ 7820:125515a0c8ed

XviD needs some more header files. Hint provided by Falk Richter and Anders Rune Jensen <anders@gnulinux.dk>.
author diego
date Mon, 21 Oct 2002 01:57:23 +0000
parents b9a9aefe0183
children edfe34c5405d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
1 /*
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
2 XAnim Video Codec DLL support
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
3
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
4 It partly emulates the Xanim codebase.
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
5 You need the -rdynamic flag to use this with gcc.
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
6
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
7 (C) 2001-2002 Alex Beregszaszi <alex@naxine.org>
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
8 and Arpad Gereoffy <arpi@thot.banki.hu>
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
9 */
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
10
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
11 #include <stdio.h>
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
12 #include <stdlib.h>
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
13 #include <string.h> /* strerror */
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
14
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
15 #include "config.h"
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
16
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
17 #ifdef USE_XANIM
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
18 #include "mp_msg.h"
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
19
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
20 #include "vd_internal.h"
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
21
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
22 static vd_info_t info = {
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
23 "XAnim codecs",
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
24 "xanim",
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
25 "A'rpi & Alex",
5272
edb622813c46 added xanim url
alex
parents: 5124
diff changeset
26 "Xanim (http://xanim.va.pubnix.com/)",
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
27 "binary codec plugins"
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
28 };
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
29
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
30 LIBVD_EXTERN(xanim)
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
31
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
32 #ifdef __FreeBSD__
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
33 #include <unistd.h>
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
34 #endif
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
35
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
36 #include <dlfcn.h> /* dlsym, dlopen, dlclose */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
37 #include <stdarg.h> /* va_alist, va_start, va_end */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
38 #include <errno.h> /* strerror, errno */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
39
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
40 #include "mp_msg.h"
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
41 #include "bswap.h"
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
42
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
43 #include "linux/timer.h"
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
44 #include "libvo/fastmemcpy.h"
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
45
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
46 #if 0
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
47 /* this should be removed */
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
48 #ifndef RTLD_NOW
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
49 #define RLTD_NOW 2
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
50 #endif
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
51 #ifndef RTLD_LAZY
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
52 #define RLTD_LAZY 1
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
53 #endif
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
54 #ifndef RTLD_GLOBAL
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
55 #define RLTD_GLOBAL 256
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
56 #endif
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
57 #endif
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
58
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
59 typedef struct
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
60 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
61 unsigned int what;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
62 unsigned int id;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
63 int (*iq_func)(); /* init/query function */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
64 unsigned int (*dec_func)(); /* opt decode function */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
65 } XAVID_FUNC_HDR;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
66
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
67 #define XAVID_WHAT_NO_MORE 0x0000
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
68 #define XAVID_AVI_QUERY 0x0001
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
69 #define XAVID_QT_QUERY 0x0002
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
70 #define XAVID_DEC_FUNC 0x0100
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
71
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
72 #define XAVID_API_REV 0x0003
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
73
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
74 typedef struct
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
75 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
76 unsigned int api_rev;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
77 char *desc;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
78 char *rev;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
79 char *copyright;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
80 char *mod_author;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
81 char *authors;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
82 unsigned int num_funcs;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
83 XAVID_FUNC_HDR *funcs;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
84 } XAVID_MOD_HDR;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
85
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
86 /* XA CODEC .. */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
87 typedef struct
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
88 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
89 void *anim_hdr;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
90 unsigned int compression;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
91 unsigned int x, y;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
92 unsigned int depth;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
93 void *extra;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
94 unsigned int xapi_rev;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
95 unsigned int (*decoder)();
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
96 char *description;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
97 unsigned int avi_ctab_flag;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
98 unsigned int (*avi_read_ext)();
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
99 } XA_CODEC_HDR;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
100
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
101 #define CODEC_SUPPORTED 1
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
102 #define CODEC_UNKNOWN 0
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
103 #define CODEC_UNSUPPORTED -1
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
104
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
105 /* fuckin colormap structures for xanim */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
106 typedef struct
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
107 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
108 unsigned short red;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
109 unsigned short green;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
110 unsigned short blue;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
111 unsigned short gray;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
112 } ColorReg;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
113
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
114 typedef struct XA_ACTION_STRUCT
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
115 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
116 int type;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
117 int cmap_rev;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
118 unsigned char *data;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
119 struct XA_ACTION_STRUCT *next;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
120 struct XA_CHDR_STRUCT *chdr;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
121 ColorReg *h_cmap;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
122 unsigned int *map;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
123 struct XA_ACTION_STRUCT *next_same_chdr;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
124 } XA_ACTION;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
125
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
126 typedef struct XA_CHDR_STRUCT
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
127 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
128 unsigned int rev;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
129 ColorReg *cmap;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
130 unsigned int csize, coff;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
131 unsigned int *map;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
132 unsigned int msize, moff;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
133 struct XA_CHDR_STRUCT *next;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
134 XA_ACTION *acts;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
135 struct XA_CHDR_STRUCT *new_chdr;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
136 } XA_CHDR;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
137
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
138 typedef struct
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
139 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
140 unsigned int cmd;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
141 unsigned int skip_flag;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
142 unsigned int imagex, imagey; /* image buffer size */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
143 unsigned int imaged; /* image depth */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
144 XA_CHDR *chdr; /* color map header */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
145 unsigned int map_flag;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
146 unsigned int *map;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
147 unsigned int xs, ys;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
148 unsigned int xe, ye;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
149 unsigned int special;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
150 void *extra;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
151 } XA_DEC_INFO;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
152
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
153 typedef struct
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
154 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
155 unsigned int file_num;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
156 unsigned int anim_type;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
157 unsigned int imagex;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
158 unsigned int imagey;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
159 unsigned int imagec;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
160 unsigned int imaged;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
161 } XA_ANIM_HDR;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
162
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
163 typedef struct {
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
164 XA_DEC_INFO *decinfo;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
165 void *file_handler;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
166 long (*iq_func)(XA_CODEC_HDR *codec_hdr);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
167 unsigned int (*dec_func)(unsigned char *image, unsigned char *delta,
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
168 unsigned int dsize, XA_DEC_INFO *dec_info);
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
169 mp_image_t *mpi;
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
170 } vd_xanim_ctx;
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
171
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
172 #if 0
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
173 typedef char xaBYTE;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
174 typedef short xaSHORT;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
175 typedef int xaLONG;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
176
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
177 typedef unsigned char xaUBYTE;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
178 typedef unsigned short xaUSHORT;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
179 typedef unsigned int xaULONG;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
180 #endif
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
181
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
182 #define xaFALSE 0
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
183 #define xaTRUE 1
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
184
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
185 #define ACT_DLTA_NORM 0x00000000
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
186 #define ACT_DLTA_BODY 0x00000001
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
187 #define ACT_DLTA_XOR 0x00000002
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
188 #define ACT_DLTA_NOP 0x00000004
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
189 #define ACT_DLTA_MAPD 0x00000008
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
190 #define ACT_DLTA_DROP 0x00000010
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
191 #define ACT_DLTA_BAD 0x80000000
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
192
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
193 #define XA_CLOSE_FUNCS 5
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
194 int xa_close_funcs = 0;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
195 void *xa_close_func[XA_CLOSE_FUNCS];
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
196
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
197 /* load, init and query */
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
198 static int xacodec_load(sh_video_t *sh, char *filename)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
199 {
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
200 vd_xanim_ctx *priv = sh->context;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
201 void *(*what_the)();
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
202 char *error;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
203 XAVID_MOD_HDR *mod_hdr;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
204 XAVID_FUNC_HDR *func;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
205 int i;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
206
7383
b9a9aefe0183 removed unused code. fixed yv12+debug-mode sig11
alex
parents: 7355
diff changeset
207 // priv->file_handler = dlopen(filename, RTLD_NOW|RTLD_GLOBAL);
b9a9aefe0183 removed unused code. fixed yv12+debug-mode sig11
alex
parents: 7355
diff changeset
208 priv->file_handler = dlopen(filename, RTLD_LAZY);
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
209 if (!priv->file_handler)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
210 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
211 error = dlerror();
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
212 if (error)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
213 mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "xacodec: failed to dlopen %s while %s\n", filename, error);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
214 else
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
215 mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "xacodec: failed to dlopen %s\n", filename);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
216 return(0);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
217 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
218
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
219 what_the = dlsym(priv->file_handler, "What_The");
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
220 if ((error = dlerror()) != NULL)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
221 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
222 mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "xacodec: failed to init %s while %s\n", filename, error);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
223 dlclose(priv->file_handler);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
224 return(0);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
225 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
226
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
227 mod_hdr = what_the();
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
228 if (!mod_hdr)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
229 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
230 mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "xacodec: initializer function failed in %s\n", filename);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
231 dlclose(priv->file_handler);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
232 return(0);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
233 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
234
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
235 mp_msg(MSGT_DECVIDEO, MSGL_V, "=== XAnim Codec ===\n");
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
236 mp_msg(MSGT_DECVIDEO, MSGL_V, " Filename: %s (API revision: %x)\n", filename, mod_hdr->api_rev);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
237 mp_msg(MSGT_DECVIDEO, MSGL_V, " Codec: %s. Rev: %s\n", mod_hdr->desc, mod_hdr->rev);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
238 if (mod_hdr->copyright)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
239 mp_msg(MSGT_DECVIDEO, MSGL_V, " %s\n", mod_hdr->copyright);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
240 if (mod_hdr->mod_author)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
241 mp_msg(MSGT_DECVIDEO, MSGL_V, " Module Author(s): %s\n", mod_hdr->mod_author);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
242 if (mod_hdr->authors)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
243 mp_msg(MSGT_DECVIDEO, MSGL_V, " Codec Author(s): %s\n", mod_hdr->authors);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
244
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
245 if (mod_hdr->api_rev > XAVID_API_REV)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
246 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
247 mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "xacodec: not supported api revision (%d) in %s\n",
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
248 mod_hdr->api_rev, filename);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
249 dlclose(priv->file_handler);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
250 return(0);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
251 }
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
252
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
253 func = mod_hdr->funcs;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
254 if (!func)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
255 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
256 mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "xacodec: function table error in %s\n", filename);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
257 dlclose(priv->file_handler);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
258 return(0);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
259 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
260
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
261 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Exported functions by codec: [functable: 0x%08x entries: %d]\n",
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
262 mod_hdr->funcs, mod_hdr->num_funcs);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
263 for (i = 0; i < (int)mod_hdr->num_funcs; i++)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
264 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
265 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, " %d: %d %d [iq:0x%08x d:0x%08x]\n",
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
266 i, func[i].what, func[i].id, func[i].iq_func, func[i].dec_func);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
267 if (func[i].what & XAVID_AVI_QUERY)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
268 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
269 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, " 0x%08x: avi init/query func (id: %d)\n",
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
270 func[i].iq_func, func[i].id);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
271 priv->iq_func = (void *)func[i].iq_func;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
272 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
273 if (func[i].what & XAVID_QT_QUERY)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
274 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
275 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, " 0x%08x: qt init/query func (id: %d)\n",
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
276 func[i].iq_func, func[i].id);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
277 priv->iq_func = (void *)func[i].iq_func;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
278 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
279 if (func[i].what & XAVID_DEC_FUNC)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
280 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
281 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, " 0x%08x: decoder func (init/query: 0x%08x) (id: %d)\n",
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
282 func[i].dec_func, func[i].iq_func, func[i].id);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
283 priv->dec_func = (void *)func[i].dec_func;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
284 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
285 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
286 return(1);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
287 }
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
288
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
289 static int xacodec_query(sh_video_t *sh, XA_CODEC_HDR *codec_hdr)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
290 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
291 vd_xanim_ctx *priv = sh->context;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
292 long ret;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
293
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
294 #if 0
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
295 /* the brute one */
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
296 if (priv->dec_func)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
297 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
298 codec_hdr->decoder = priv->dec_func;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
299 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "We got decoder's address at init! %p\n", codec_hdr->decoder);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
300 return(1);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
301 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
302 #endif
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
303
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
304 ret = priv->iq_func(codec_hdr);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
305 switch(ret)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
306 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
307 case CODEC_SUPPORTED:
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
308 priv->dec_func = (void *)codec_hdr->decoder;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
309 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Codec is supported: found decoder for %s at 0x%08x\n",
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
310 codec_hdr->description, codec_hdr->decoder);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
311 return(1);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
312 case CODEC_UNSUPPORTED:
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
313 mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "Codec (%s) is unsupported by dll\n",
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
314 codec_hdr->description);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
315 return(0);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
316 case CODEC_UNKNOWN:
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
317 default:
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
318 mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "Codec (%s) is unknown by dll\n",
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
319 codec_hdr->description);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
320 return(0);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
321 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
322 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
323
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
324 void XA_Print(char *fmt, ...)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
325 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
326 va_list vallist;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
327 char buf[1024];
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
328
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
329 va_start(vallist, fmt);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
330 vsnprintf(buf, 1024, fmt, vallist);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
331 mp_msg(MSGT_XACODEC, MSGL_DBG2, "[xacodec] %s\n", buf);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
332 va_end(vallist);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
333
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
334 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
335 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
336
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
337 /* 0 is no debug (needed by 3ivX) */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
338 long xa_debug = 0;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
339
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
340 void TheEnd1(char *err_mess)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
341 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
342 XA_Print("error: %s - exiting\n", err_mess);
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
343 /* we should exit here... */
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
344
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
345 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
346 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
347
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
348 void XA_Add_Func_To_Free_Chain(XA_ANIM_HDR *anim_hdr, void (*function)())
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
349 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
350 // XA_Print("XA_Add_Func_To_Free_Chain('anim_hdr: %08x', 'function: %08x')",
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
351 // anim_hdr, function);
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
352 xa_close_func[xa_close_funcs] = function;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
353 if (xa_close_funcs+1 < XA_CLOSE_FUNCS)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
354 xa_close_funcs++;
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
355
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
356 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
357 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
358
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
359
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
360 unsigned long XA_Time_Read()
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
361 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
362 return GetTimer(); //(GetRelativeTime());
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
363 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
364
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
365 void XA_dummy()
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
366 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
367 XA_Print("dummy() called");
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
368 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
369
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
370 void XA_Gen_YUV_Tabs(XA_ANIM_HDR *anim_hdr)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
371 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
372 XA_Print("XA_Gen_YUV_Tabs('anim_hdr: %08x')", anim_hdr);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
373 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
374 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
375
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
376 void JPG_Setup_Samp_Limit_Table(XA_ANIM_HDR *anim_hdr)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
377 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
378 XA_Print("JPG_Setup_Samp_Limit_Table('anim_hdr: %08x')", anim_hdr);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
379 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
380 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
381
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
382 void JPG_Alloc_MCU_Bufs(XA_ANIM_HDR *anim_hdr, unsigned int width,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
383 unsigned int height, unsigned int full_flag)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
384 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
385 XA_Print("JPG_Alloc_MCU_Bufs('anim_hdr: %08x', 'width: %d', 'height: %d', 'full_flag: %d')",
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
386 anim_hdr, width, height, full_flag);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
387 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
388 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
389
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
390 /* --------------- 4x4 pixel YUV block fillers [CVID] ----------------- */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
391
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
392 typedef struct
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
393 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
394 unsigned char r0, g0, b0;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
395 unsigned char r1, g1, b1;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
396 unsigned char r2, g2, b2;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
397 unsigned char r3, g3, b3;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
398 unsigned int clr0_0, clr0_1, clr0_2, clr0_3;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
399 unsigned int clr1_0, clr1_1, clr1_2, clr1_3;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
400 unsigned int clr2_0, clr2_1, clr2_2, clr2_3;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
401 unsigned int clr3_0, clr3_1, clr3_2, clr3_3;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
402 } XA_2x2_Color;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
403
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
404 #define SET_4_YUV_PIXELS(image,x,y,cmap2x2) \
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
405 image->planes[0][((x)+0)+((y)+0)*image->stride[0]]=cmap2x2->clr0_0;\
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
406 image->planes[0][((x)+1)+((y)+0)*image->stride[0]]=cmap2x2->clr0_1;\
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
407 image->planes[0][((x)+0)+((y)+1)*image->stride[0]]=cmap2x2->clr0_2;\
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
408 image->planes[0][((x)+1)+((y)+1)*image->stride[0]]=cmap2x2->clr0_3;\
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
409 image->planes[1][((x)>>1)+((y)>>1)*image->stride[1]]=cmap2x2->clr1_0;\
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
410 image->planes[2][((x)>>1)+((y)>>1)*image->stride[2]]=cmap2x2->clr1_1;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
411
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
412 void XA_2x2_OUT_1BLK_Convert(unsigned char *image_p, unsigned int x, unsigned int y,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
413 unsigned int imagex, XA_2x2_Color *cmap2x2)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
414 {
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
415 mp_image_t *mpi = (mp_image_t *)image_p;
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
416
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
417 #if 0
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
418 SET_4_YUV_PIXELS(mpi,x,y,cmap2x2)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
419 #else
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
420 SET_4_YUV_PIXELS(mpi,x,y,cmap2x2)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
421 SET_4_YUV_PIXELS(mpi,x+2,y,cmap2x2)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
422 SET_4_YUV_PIXELS(mpi,x,y+2,cmap2x2)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
423 SET_4_YUV_PIXELS(mpi,x+2,y+2,cmap2x2)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
424 #endif
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
425
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
426 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
427 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
428
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
429 void XA_2x2_OUT_4BLKS_Convert(unsigned char *image_p, unsigned int x, unsigned int y,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
430 unsigned int imagex, XA_2x2_Color *cm0, XA_2x2_Color *cm1, XA_2x2_Color *cm2,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
431 XA_2x2_Color *cm3)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
432 {
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
433 mp_image_t *mpi = (mp_image_t *)image_p;
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
434
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
435 SET_4_YUV_PIXELS(mpi,x,y,cm0)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
436 SET_4_YUV_PIXELS(mpi,x+2,y,cm1)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
437 SET_4_YUV_PIXELS(mpi,x,y+2,cm2)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
438 SET_4_YUV_PIXELS(mpi,x+2,y+2,cm3)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
439 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
440 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
441
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
442 void *YUV2x2_Blk_Func(unsigned int image_type, int blks, unsigned int dith_flag)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
443 {
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
444 mp_dbg(MSGT_DECVIDEO,MSGL_DBG2, "YUV2x2_Blk_Func(image_type=%d, blks=%d, dith_flag=%d)\n",
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
445 image_type, blks, dith_flag);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
446 switch(blks){
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
447 case 1:
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
448 return (void*) XA_2x2_OUT_1BLK_Convert;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
449 case 4:
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
450 return (void*) XA_2x2_OUT_4BLKS_Convert;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
451 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
452
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
453 mp_msg(MSGT_DECVIDEO,MSGL_WARN,"Unimplemented: YUV2x2_Blk_Func(image_type=%d blks=%d dith=%d)\n",image_type,blks,dith_flag);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
454 return (void*) XA_dummy;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
455 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
456
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
457 // Take Four Y's and UV and put them into a 2x2 Color structure.
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
458
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
459 void XA_YUV_2x2_clr(XA_2x2_Color *cmap2x2, unsigned int Y0, unsigned int Y1,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
460 unsigned int Y2, unsigned int Y3, unsigned int U, unsigned int V,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
461 unsigned int map_flag, unsigned int *map, XA_CHDR *chdr)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
462 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
463
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
464 mp_dbg(MSGT_DECVIDEO,MSGL_DBG3, "XA_YUV_2x2_clr(%p [%d,%d,%d,%d][%d][%d] %d %p %p)\n",
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
465 cmap2x2,Y0,Y1,Y2,Y3,U,V,map_flag,map,chdr);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
466
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
467 cmap2x2->clr0_0=Y0;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
468 cmap2x2->clr0_1=Y1;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
469 cmap2x2->clr0_2=Y2;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
470 cmap2x2->clr0_3=Y3;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
471 cmap2x2->clr1_0=U;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
472 cmap2x2->clr1_1=V;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
473 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
474 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
475
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
476 void *YUV2x2_Map_Func(unsigned int image_type, unsigned int dith_type)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
477 {
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
478 mp_dbg(MSGT_DECVIDEO,MSGL_DBG2, "YUV2x2_Map_Func('image_type: %d', 'dith_type: %d')",
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
479 image_type, dith_type);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
480 return((void*)XA_YUV_2x2_clr);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
481 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
482
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
483 /* -------------------- whole YUV frame converters ------------------------- */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
484
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
485 typedef struct
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
486 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
487 unsigned char *Ybuf;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
488 unsigned char *Ubuf;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
489 unsigned char *Vbuf;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
490 unsigned char *the_buf;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
491 unsigned int the_buf_size;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
492 unsigned short y_w, y_h;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
493 unsigned short uv_w, uv_h;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
494 } YUVBufs;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
495
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
496 typedef struct
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
497 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
498 unsigned long Uskip_mask;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
499 long *YUV_Y_tab;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
500 long *YUV_UB_tab;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
501 long *YUV_VR_tab;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
502 long *YUV_UG_tab;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
503 long *YUV_VG_tab;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
504 } YUVTabs;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
505
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
506 YUVBufs jpg_YUVBufs;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
507 YUVTabs def_yuv_tabs;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
508
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
509 /* -------------- YUV 4x4 1x1 1x1 (4:1:0 aka YVU9) [Indeo 3,4,5] ------------------ */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
510
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
511 void XA_YUV1611_Convert(unsigned char *image_p, unsigned int imagex, unsigned int imagey,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
512 unsigned int i_x, unsigned int i_y, YUVBufs *yuv, YUVTabs *yuv_tabs,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
513 unsigned int map_flag, unsigned int *map, XA_CHDR *chdr)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
514 {
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
515 sh_video_t *sh = (sh_video_t*)image_p;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
516 vd_xanim_ctx *priv = sh->context;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
517 mp_image_t *mpi;
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
518 int y;
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
519 int ystride=(yuv->y_w)?yuv->y_w:imagex;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
520 int uvstride=(yuv->uv_w)?yuv->uv_w:(imagex/4);
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
521
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
522 mp_dbg(MSGT_DECVIDEO,MSGL_DBG3, "YUVTabs: %d %p %p %p %p %p\n",yuv_tabs->Uskip_mask,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
523 yuv_tabs->YUV_Y_tab,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
524 yuv_tabs->YUV_UB_tab,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
525 yuv_tabs->YUV_VR_tab,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
526 yuv_tabs->YUV_UG_tab,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
527 yuv_tabs->YUV_VG_tab );
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
528
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
529 mp_dbg(MSGT_DECVIDEO,MSGL_DBG3, "XA_YUV1611_Convert('image: %08x', 'imagex: %d', 'imagey: %d', 'i_x: %d', 'i_y: %d', 'yuv_bufs: %08x', 'yuv_tabs: %08x', 'map_flag: %d', 'map: %08x', 'chdr: %08x')",
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
530 image_p, imagex, imagey, i_x, i_y, yuv, yuv_tabs, map_flag, map, chdr);
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
531
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
532 mp_dbg(MSGT_DECVIDEO,MSGL_DBG3, "YUV: %p %p %p %X (%d) %dx%d %dx%d\n",
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
533 yuv->Ybuf,yuv->Ubuf,yuv->Vbuf,yuv->the_buf,yuv->the_buf_size,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
534 yuv->y_w,yuv->y_h,yuv->uv_w,yuv->uv_h);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
535
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
536 if(!yuv_tabs->YUV_Y_tab){
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
537 // standard YVU9 - simply export it!
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
538 mpi = mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0,
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
539 sh->disp_w, sh->disp_h);
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
540 priv->mpi=mpi; if(!mpi) return; // ERROR!
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
541 mpi->planes[0]=yuv->Ybuf;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
542 mpi->planes[1]=yuv->Ubuf;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
543 mpi->planes[2]=yuv->Vbuf;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
544 mpi->width=imagex;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
545 mpi->stride[0]=ystride; //i_x; // yuv->y_w
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
546 mpi->stride[1]=mpi->stride[2]=uvstride; //i_x/4; // yuv->uv_w
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
547 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
548 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
549
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
550 // allocate TEMP buffer and convert the image:
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
551 mpi = mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
552 sh->disp_w, sh->disp_h);
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
553 priv->mpi=mpi; if(!mpi) return; // ERROR!
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
554
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
555 // convert the Y plane:
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
556 for(y=0;y<(int)imagey;y++){
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
557 unsigned int x;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
558 unsigned char* s=yuv->Ybuf+ystride*y;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
559 unsigned char* d=mpi->planes[0]+mpi->stride[0]*y;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
560 for(x=0;x<imagex;x++) d[x]=s[x]<<1;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
561 }
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
562
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
563 imagex>>=2;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
564 imagey>>=2;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
565
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
566 // convert the U plane:
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
567 for(y=0;y<(int)imagey;y++){
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
568 unsigned int x;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
569 unsigned char* s=yuv->Ubuf+uvstride*y;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
570 unsigned char* d=mpi->planes[1]+mpi->stride[1]*y;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
571 for(x=0;x<imagex;x++) d[x]=s[x]<<1;
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
572 }
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
573
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
574 // convert the V plane:
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
575 for(y=0;y<(int)imagey;y++){
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
576 unsigned int x;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
577 unsigned char* s=yuv->Vbuf+uvstride*y;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
578 unsigned char* d=mpi->planes[2]+mpi->stride[2]*y;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
579 for(x=0;x<imagex;x++) d[x]=s[x]<<1;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
580 }
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
581 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
582
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
583 void *XA_YUV1611_Func(unsigned int image_type)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
584 {
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
585 mp_dbg(MSGT_DECVIDEO,MSGL_DBG2, "XA_YUV1611_Func('image_type: %d')", image_type);
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
586 return((void *)XA_YUV1611_Convert);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
587 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
588
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
589 /* --------------- YUV 2x2 1x1 1x1 (4:2:0 aka YV12) [3ivX,H263] ------------ */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
590
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
591 void XA_YUV221111_Convert(unsigned char *image_p, unsigned int imagex, unsigned int imagey,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
592 unsigned int i_x, unsigned int i_y, YUVBufs *yuv, YUVTabs *yuv_tabs, unsigned int map_flag,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
593 unsigned int *map, XA_CHDR *chdr)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
594 {
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
595 sh_video_t *sh = (sh_video_t*)image_p;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
596 vd_xanim_ctx *priv = sh->context;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
597 mp_image_t *mpi;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
598 // note: 3ivX codec doesn't set y_w, uv_w, they are random junk :(
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
599 int ystride=imagex; //(yuv->y_w)?yuv->y_w:imagex;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
600 int uvstride=imagex/2; //(yuv->uv_w)?yuv->uv_w:(imagex/2);
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
601
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
602 mp_dbg(MSGT_DECVIDEO,MSGL_DBG3, "XA_YUV221111_Convert(%p %dx%d %d;%d [%dx%d] %p %p %d %p %p)\n",
7383
b9a9aefe0183 removed unused code. fixed yv12+debug-mode sig11
alex
parents: 7355
diff changeset
603 image_p,imagex,imagey,i_x,i_y, sh->disp_w, sh->disp_h,
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
604 yuv,yuv_tabs,map_flag,map,chdr);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
605
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
606 mp_dbg(MSGT_DECVIDEO,MSGL_DBG3, "YUV: %p %p %p %X (%X) %Xx%X %Xx%X\n",
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
607 yuv->Ybuf,yuv->Ubuf,yuv->Vbuf,yuv->the_buf,yuv->the_buf_size,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
608 yuv->y_w,yuv->y_h,yuv->uv_w,yuv->uv_h);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
609
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
610 // standard YV12 - simply export it!
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
611 mpi = mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0, sh->disp_w, sh->disp_h);
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
612 priv->mpi=mpi; if(!mpi) return; // ERROR!
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
613 mpi->planes[0]=yuv->Ybuf;
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
614 mpi->planes[1]=yuv->Ubuf;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
615 mpi->planes[2]=yuv->Vbuf;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
616 mpi->width=imagex;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
617 mpi->stride[0]=ystride; //i_x; // yuv->y_w
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
618 mpi->stride[1]=mpi->stride[2]=uvstride; //=i_x/4; // yuv->uv_w
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
619 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
620
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
621 void *XA_YUV221111_Func(unsigned int image_type)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
622 {
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
623 mp_dbg(MSGT_DECVIDEO,MSGL_DBG2, "XA_YUV221111_Func('image_type: %d')\n",image_type);
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
624 return((void *)XA_YUV221111_Convert);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
625 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
626
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
627 /* *** EOF XANIM *** */
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
628
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
629 // to set/get/query special features/parameters
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
630 static int control(sh_video_t *sh,int cmd,void* arg,...){
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
631 return CONTROL_UNKNOWN;
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
632 }
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
633
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
634 // init driver
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
635 static int init(sh_video_t *sh)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
636 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
637 vd_xanim_ctx *priv;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
638 char *def_path = XACODEC_PATH;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
639 char dll[1024];
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
640 XA_CODEC_HDR codec_hdr;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
641 int i;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
642
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
643 priv = malloc(sizeof(vd_xanim_ctx));
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
644 if (!priv)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
645 return 0;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
646 sh->context = priv;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
647 memset(priv, 0, sizeof(vd_xanim_ctx));
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
648
6525
0a7be46617d8 yvu9 and if09 support
alex
parents: 5272
diff changeset
649 if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YV12)) return 0;
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
650
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
651 priv->iq_func = NULL;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
652 priv->dec_func = NULL;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
653
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
654 for (i=0; i < XA_CLOSE_FUNCS; i++)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
655 xa_close_func[i] = NULL;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
656
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
657 if (getenv("XANIM_MOD_DIR"))
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
658 def_path = getenv("XANIM_MOD_DIR");
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
659
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
660 snprintf(dll, 1024, "%s/%s", def_path, sh->codec->dll);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
661 if (xacodec_load(sh, dll) == 0)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
662 return(0);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
663
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
664 codec_hdr.xapi_rev = XAVID_API_REV;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
665 codec_hdr.anim_hdr = malloc(4096);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
666 codec_hdr.description = sh->codec->info;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
667 codec_hdr.compression = bswap_32(sh->bih->biCompression);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
668 codec_hdr.decoder = NULL;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
669 codec_hdr.x = sh->bih->biWidth; /* ->disp_w */
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
670 codec_hdr.y = sh->bih->biHeight; /* ->disp_h */
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
671 /* extra fields to store palette */
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
672 codec_hdr.avi_ctab_flag = 0;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
673 codec_hdr.avi_read_ext = NULL;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
674 codec_hdr.extra = NULL;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
675
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
676 switch(sh->codec->outfmt[sh->outfmtidx])
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
677 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
678 case IMGFMT_BGR32:
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
679 codec_hdr.depth = 32;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
680 break;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
681 case IMGFMT_BGR24:
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
682 codec_hdr.depth = 24;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
683 break;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
684 case IMGFMT_IYUV:
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
685 case IMGFMT_I420:
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
686 case IMGFMT_YV12:
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
687 codec_hdr.depth = 12;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
688 break;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
689 case IMGFMT_YVU9:
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
690 codec_hdr.depth = 9;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
691 break;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
692 default:
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
693 mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "xacodec: not supported image out format (%s)\n",
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
694 vo_format_name(sh->codec->outfmt[sh->outfmtidx]));
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
695 return(0);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
696 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
697 mp_msg(MSGT_DECVIDEO, MSGL_INFO, "xacodec: querying for input %dx%d %dbit [fourcc: %4x] (%s)...\n",
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
698 codec_hdr.x, codec_hdr.y, codec_hdr.depth, codec_hdr.compression, codec_hdr.description);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
699
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
700 if (xacodec_query(sh, &codec_hdr) == 0)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
701 return(0);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
702
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
703 // free(codec_hdr.anim_hdr);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
704
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
705 priv->decinfo = malloc(sizeof(XA_DEC_INFO));
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
706 if (priv->decinfo == NULL)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
707 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
708 mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "xacodec: memory allocation error: %s\n",
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
709 strerror(errno));
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
710 return(0);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
711 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
712 priv->decinfo->cmd = 0;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
713 priv->decinfo->skip_flag = 0;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
714 priv->decinfo->imagex = priv->decinfo->xe = codec_hdr.x;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
715 priv->decinfo->imagey = priv->decinfo->ye = codec_hdr.y;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
716 priv->decinfo->imaged = codec_hdr.depth;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
717 priv->decinfo->chdr = NULL;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
718 priv->decinfo->map_flag = 0; /* xaFALSE */
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
719 priv->decinfo->map = NULL;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
720 priv->decinfo->xs = priv->decinfo->ys = 0;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
721 priv->decinfo->special = 0;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
722 priv->decinfo->extra = codec_hdr.extra;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
723 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "decinfo->extra, filled by codec: 0x%08x [%s]\n",
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
724 &priv->decinfo->extra, priv->decinfo->extra);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
725
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
726 return(1);
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
727 }
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
728
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
729 // uninit driver
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
730 static void uninit(sh_video_t *sh)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
731 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
732 vd_xanim_ctx *priv = sh->context;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
733 int i;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
734 void (*close_func)();
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
735
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
736 for (i=0; i < XA_CLOSE_FUNCS; i++)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
737 if (xa_close_func[i])
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
738 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
739 close_func = xa_close_func[i];
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
740 close_func();
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
741 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
742 dlclose(priv->file_handler);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
743 if (priv->decinfo != NULL)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
744 free(priv->decinfo);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
745 free(priv);
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
746 }
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
747
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
748 // unsigned int (*dec_func)(unsigned char *image, unsigned char *delta,
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
749 // unsigned int dsize, XA_DEC_INFO *dec_info);
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
750
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
751 // decode a frame
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
752 static mp_image_t* decode(sh_video_t *sh, void *data, int len, int flags)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
753 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
754 vd_xanim_ctx *priv = sh->context;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
755 unsigned int ret;
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
756
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
757 if (len <= 0)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
758 return NULL; // skipped frame
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
759
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
760 priv->decinfo->skip_flag = (flags&3)?1:0;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
761
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
762 if(sh->codec->outflags[sh->outfmtidx] & CODECS_FLAG_STATIC){
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
763 // allocate static buffer for cvid-like codecs:
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
764 priv->mpi = mpcodecs_get_image(sh, MP_IMGTYPE_STATIC,
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
765 MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE,
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
766 (sh->disp_w+3)&(~3), (sh->disp_h+3)&(~3));
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
767 if (!priv->mpi) return NULL;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
768 ret = priv->dec_func((uint8_t*)priv->mpi, data, len, priv->decinfo);
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
769 } else {
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
770 // left the buffer allocation to the codecs, pass sh_video && priv
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
771 priv->mpi=NULL;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
772 ret = priv->dec_func((uint8_t*)sh, data, len, priv->decinfo);
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
773 }
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
774
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
775 if (ret == ACT_DLTA_NORM)
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
776 return priv->mpi;
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
777
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
778 if (ret & ACT_DLTA_MAPD)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
779 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "mapd\n");
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
780 /*
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
781 if (!(ret & ACT_DLT_MAPD))
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
782 xacodec_driver->decinfo->map_flag = 0;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
783 else
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
784 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
785 xacodec_driver->decinfo->map_flag = 1;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
786 xacodec_driver->decinfo->map = ...
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
787 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
788 */
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
789
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
790 if (ret & ACT_DLTA_XOR)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
791 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
792 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "xor\n");
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
793 return priv->mpi;
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
794 }
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
795
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
796 /* nothing changed */
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
797 if (ret & ACT_DLTA_NOP)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
798 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
799 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "nop\n");
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
800 return NULL;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
801 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
802
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
803 /* frame dropped (also display latest frame) */
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
804 if (ret & ACT_DLTA_DROP)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
805 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
806 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "drop\n");
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
807 return NULL;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
808 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
809
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
810 if (ret & ACT_DLTA_BAD)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
811 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
812 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "bad\n");
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
813 return NULL;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
814 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
815
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
816 /* used for double buffer */
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
817 if (ret & ACT_DLTA_BODY)
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
818 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
819 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "body\n");
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
820 return NULL;
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
821 }
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
822
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
823 return priv->mpi;
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
824 }
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
825 #endif