annotate libmpcodecs/vd_xanim.c @ 30894:aac2ca51ece0

Drop support for XANIM_MOD_DIR environment variable. It is now possible to specify alternative codec paths on the comand line. Furthermore, XANIM_MOD_DIR was never properly documented.
author diego
date Thu, 18 Mar 2010 23:37:57 +0000
parents 82e3adea8476
children e907ff9e7e77
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 /*
30421
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
2 * XAnim Video Codec DLL support
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
3 *
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
4 * It partly emulates the Xanim codebase.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
5 * You need the -rdynamic flag to use this with gcc.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
6 *
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
7 * Copyright (C) 2001-2002 Alex Beregszaszi
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
8 * Arpad Gereoffy <arpi@thot.banki.hu>
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
9 *
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
10 * This file is part of MPlayer.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
11 *
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
12 * MPlayer is free software; you can redistribute it and/or modify
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
13 * it under the terms of the GNU General Public License as published by
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
14 * the Free Software Foundation; either version 2 of the License, or
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
15 * (at your option) any later version.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
16 *
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
17 * MPlayer is distributed in the hope that it will be useful,
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
20 * GNU General Public License for more details.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
21 *
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
22 * You should have received a copy of the GNU General Public License along
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
23 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
24 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 29263
diff changeset
25 */
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
26
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
27 #include <stdio.h>
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
28 #include <stdlib.h>
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
29 #include <string.h> /* strerror */
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
30
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
31 #include "config.h"
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
32
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
33 #include "mp_msg.h"
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
34
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
35 #include "vd_internal.h"
30893
82e3adea8476 Reuse codec path variable used in the binary loader in the XAnim loader.
diego
parents: 30846
diff changeset
36 #include "loader/codecpath.h"
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
37
30504
cc27da5d7286 Mark all ad_info_t/vd_info_t structure declarations as const.
diego
parents: 30421
diff changeset
38 static const vd_info_t info = {
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
39 "XAnim codecs",
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
40 "xanim",
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
41 "A'rpi & Alex",
5272
edb622813c46 added xanim url
alex
parents: 5124
diff changeset
42 "Xanim (http://xanim.va.pubnix.com/)",
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
43 "binary codec plugins"
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
44 };
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
45
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
46 LIBVD_EXTERN(xanim)
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
47
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
48 #ifdef __FreeBSD__
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
49 #include <unistd.h>
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
50 #endif
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
51
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
52 #include <dlfcn.h> /* dlsym, dlopen, dlclose */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
53 #include <stdarg.h> /* va_alist, va_start, va_end */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
54 #include <errno.h> /* strerror, errno */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
55
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
56 #include "mp_msg.h"
26542
3a2e8ae7c548 Consistently #include mpbswap.h instead of bswap.h everywhere.
diego
parents: 23375
diff changeset
57 #include "mpbswap.h"
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
58
9380
edfe34c5405d linux->osdep
arpi
parents: 7383
diff changeset
59 #include "osdep/timer.h"
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
60
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
61 #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
62 /* 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
63 #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
64 #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
65 #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
66 #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
67 #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
68 #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
69 #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
70 #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
71 #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
72 #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
73
7285
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 what;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
77 unsigned int id;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
78 int (*iq_func)(); /* init/query function */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
79 unsigned int (*dec_func)(); /* opt decode function */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
80 } XAVID_FUNC_HDR;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
81
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
82 #define XAVID_WHAT_NO_MORE 0x0000
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
83 #define XAVID_AVI_QUERY 0x0001
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
84 #define XAVID_QT_QUERY 0x0002
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
85 #define XAVID_DEC_FUNC 0x0100
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
86
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
87 #define XAVID_API_REV 0x0003
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 typedef struct
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
90 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
91 unsigned int api_rev;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
92 char *desc;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
93 char *rev;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
94 char *copyright;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
95 char *mod_author;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
96 char *authors;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
97 unsigned int num_funcs;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
98 XAVID_FUNC_HDR *funcs;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
99 } XAVID_MOD_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 /* XA CODEC .. */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
102 typedef struct
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
103 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
104 void *anim_hdr;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
105 unsigned int compression;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
106 unsigned int x, y;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
107 unsigned int depth;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
108 void *extra;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
109 unsigned int xapi_rev;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
110 unsigned int (*decoder)();
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
111 char *description;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
112 unsigned int avi_ctab_flag;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
113 unsigned int (*avi_read_ext)();
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
114 } XA_CODEC_HDR;
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 #define CODEC_SUPPORTED 1
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
117 #define CODEC_UNKNOWN 0
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
118 #define CODEC_UNSUPPORTED -1
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
119
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
120 /* fuckin colormap structures for xanim */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
121 typedef struct
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
122 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
123 unsigned short red;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
124 unsigned short green;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
125 unsigned short blue;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
126 unsigned short gray;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
127 } ColorReg;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
128
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
129 typedef struct XA_ACTION_STRUCT
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
130 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
131 int type;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
132 int cmap_rev;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
133 unsigned char *data;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
134 struct XA_ACTION_STRUCT *next;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
135 struct XA_CHDR_STRUCT *chdr;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
136 ColorReg *h_cmap;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
137 unsigned int *map;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
138 struct XA_ACTION_STRUCT *next_same_chdr;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
139 } XA_ACTION;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
140
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
141 typedef struct XA_CHDR_STRUCT
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
142 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
143 unsigned int rev;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
144 ColorReg *cmap;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
145 unsigned int csize, coff;
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 msize, moff;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
148 struct XA_CHDR_STRUCT *next;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
149 XA_ACTION *acts;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
150 struct XA_CHDR_STRUCT *new_chdr;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
151 } XA_CHDR;
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 cmd;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
156 unsigned int skip_flag;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
157 unsigned int imagex, imagey; /* image buffer size */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
158 unsigned int imaged; /* image depth */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
159 XA_CHDR *chdr; /* color map header */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
160 unsigned int map_flag;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
161 unsigned int *map;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
162 unsigned int xs, ys;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
163 unsigned int xe, ye;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
164 unsigned int special;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
165 void *extra;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
166 } XA_DEC_INFO;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
167
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
168 typedef struct
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
169 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
170 unsigned int file_num;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
171 unsigned int anim_type;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
172 unsigned int imagex;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
173 unsigned int imagey;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
174 unsigned int imagec;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
175 unsigned int imaged;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
176 } XA_ANIM_HDR;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
177
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
178 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
179 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
180 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
181 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
182 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
183 unsigned int dsize, XA_DEC_INFO *dec_info);
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
184 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
185 } vd_xanim_ctx;
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
186
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
187 #if 0
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
188 typedef char xaBYTE;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
189 typedef short xaSHORT;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
190 typedef int xaLONG;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
191
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
192 typedef unsigned char xaUBYTE;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
193 typedef unsigned short xaUSHORT;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
194 typedef unsigned int xaULONG;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
195 #endif
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
196
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
197 #define xaFALSE 0
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
198 #define xaTRUE 1
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 #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
201 #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
202 #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
203 #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
204 #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
205 #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
206 #define ACT_DLTA_BAD 0x80000000
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
207
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
208 #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
209 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
210 void *xa_close_func[XA_CLOSE_FUNCS];
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
211
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
212 /* 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
213 static int xacodec_load(sh_video_t *sh, char *filename)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
214 {
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
215 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
216 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
217 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
218 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
219 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
220 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
221
7383
b9a9aefe0183 removed unused code. fixed yv12+debug-mode sig11
alex
parents: 7355
diff changeset
222 // priv->file_handler = dlopen(filename, RTLD_NOW|RTLD_GLOBAL);
b9a9aefe0183 removed unused code. fixed yv12+debug-mode sig11
alex
parents: 7355
diff changeset
223 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
224 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
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 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
227 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
228 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
229 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
230 mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "xacodec: failed to dlopen %s\n", filename);
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
231 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
232 }
641b287f8b07 removed xacodec_driver, 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 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
235 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
236 {
641b287f8b07 removed xacodec_driver, 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_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
238 dlclose(priv->file_handler);
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
239 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
240 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26754
diff changeset
241
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
242 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
243 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
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 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
246 dlclose(priv->file_handler);
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
247 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
248 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26754
diff changeset
249
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
250 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
251 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
252 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
253 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
254 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
255 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
256 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
257 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
258 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
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 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
261 {
641b287f8b07 removed xacodec_driver, 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 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
263 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
264 dlclose(priv->file_handler);
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
265 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
266 }
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
267
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
268 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
269 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
270 {
641b287f8b07 removed xacodec_driver, 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 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
272 dlclose(priv->file_handler);
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
273 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
274 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26754
diff changeset
275
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 10368
diff changeset
276 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Exported functions by codec: [functable: %p entries: %d]\n",
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
277 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
278 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
279 {
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 10368
diff changeset
280 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, " %d: %d %d [iq:%p d:%p]\n",
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
281 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
282 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
283 {
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 10368
diff changeset
284 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, " %p: avi init/query func (id: %d)\n",
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
285 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
286 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
287 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
288 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
289 {
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 10368
diff changeset
290 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, " %p: qt init/query func (id: %d)\n",
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
291 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
292 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
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 (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
295 {
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 10368
diff changeset
296 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, " %p: decoder func (init/query: %p) (id: %d)\n",
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
297 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
298 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
299 }
641b287f8b07 removed xacodec_driver, 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 }
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
301 return 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
302 }
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
303
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
304 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
305 {
641b287f8b07 removed xacodec_driver, 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 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
307 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
308
641b287f8b07 removed xacodec_driver, 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 #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
310 /* 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
311 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
312 {
641b287f8b07 removed xacodec_driver, 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 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
314 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "We got decoder's address at init! %p\n", codec_hdr->decoder);
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
315 return 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
316 }
641b287f8b07 removed xacodec_driver, 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 #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
318
641b287f8b07 removed xacodec_driver, 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 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
320 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
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 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
323 priv->dec_func = (void *)codec_hdr->decoder;
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 10368
diff changeset
324 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Codec is supported: found decoder for %s at %p\n",
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
325 codec_hdr->description, codec_hdr->decoder);
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
326 return 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
327 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
328 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
329 codec_hdr->description);
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
330 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
331 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
332 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
333 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
334 codec_hdr->description);
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
335 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
336 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
337 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
338
30565
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
339 /* These functions are required for loading XAnim binary libs.
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
340 * Add forward declarations to avoid warnings with -Wmissing-prototypes. */
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
341 void XA_Print(char *fmt, ...);
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
342 void TheEnd1(char *err_mess);
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
343 void XA_Add_Func_To_Free_Chain(XA_ANIM_HDR *anim_hdr, void (*function)());
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
344 unsigned long XA_Time_Read(void);
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
345 void XA_Gen_YUV_Tabs(XA_ANIM_HDR *anim_hdr);
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
346 void JPG_Setup_Samp_Limit_Table(XA_ANIM_HDR *anim_hdr);
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
347 void JPG_Alloc_MCU_Bufs(XA_ANIM_HDR *anim_hdr, unsigned int width,
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
348 unsigned int height, unsigned int full_flag);
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
349 void *YUV2x2_Blk_Func(unsigned int image_type, int blks,
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
350 unsigned int dith_flag);
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
351 void *YUV2x2_Map_Func(unsigned int image_type, unsigned int dith_type);
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
352 void *XA_YUV1611_Func(unsigned int image_type);
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
353 void *XA_YUV221111_Func(unsigned int image_type);
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
354
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
355 void XA_Print(char *fmt, ...)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
356 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
357 va_list vallist;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
358 char buf[1024];
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 va_start(vallist, fmt);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
361 vsnprintf(buf, 1024, fmt, vallist);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
362 mp_msg(MSGT_XACODEC, MSGL_DBG2, "[xacodec] %s\n", buf);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
363 va_end(vallist);
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 return;
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
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
368 /* 0 is no debug (needed by 3ivX) */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
369 long xa_debug = 0;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
370
30565
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
371 void TheEnd1(char *err_mess)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
372 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
373 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
374 /* we should exit here... */
7285
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 return;
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
30565
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
379 void XA_Add_Func_To_Free_Chain(XA_ANIM_HDR *anim_hdr, void (*function)())
7285
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 // 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
382 // 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
383 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
384 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
385 xa_close_funcs++;
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
386
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
30565
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
390 unsigned long XA_Time_Read(void)
7285
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 return GetTimer(); //(GetRelativeTime());
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
30555
ad6740b58b0d libmpcodecs: Mark functions not used outside of their files as static.
diego
parents: 30504
diff changeset
395 static void XA_dummy(void)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
396 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
397 XA_Print("dummy() called");
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
398 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
399
30565
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
400 void XA_Gen_YUV_Tabs(XA_ANIM_HDR *anim_hdr)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
401 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
402 XA_Print("XA_Gen_YUV_Tabs('anim_hdr: %08x')", anim_hdr);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
403 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
404 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
405
30565
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
406 void JPG_Setup_Samp_Limit_Table(XA_ANIM_HDR *anim_hdr)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
407 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
408 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
409 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
410 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
411
30565
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
412 void JPG_Alloc_MCU_Bufs(XA_ANIM_HDR *anim_hdr, unsigned int width,
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
413 unsigned int height, unsigned int full_flag)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
414 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
415 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
416 anim_hdr, width, height, full_flag);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
417 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
418 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
419
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
420 /* --------------- 4x4 pixel YUV block fillers [CVID] ----------------- */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
421
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
422 typedef struct
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
423 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
424 unsigned char r0, g0, b0;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
425 unsigned char r1, g1, b1;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
426 unsigned char r2, g2, b2;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
427 unsigned char r3, g3, b3;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
428 unsigned int clr0_0, clr0_1, clr0_2, clr0_3;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
429 unsigned int clr1_0, clr1_1, clr1_2, clr1_3;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
430 unsigned int clr2_0, clr2_1, clr2_2, clr2_3;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
431 unsigned int clr3_0, clr3_1, clr3_2, clr3_3;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
432 } XA_2x2_Color;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
433
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
434 #define SET_4_YUV_PIXELS(image,x,y,cmap2x2) \
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
435 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
436 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
437 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
438 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
439 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
440 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
441
30555
ad6740b58b0d libmpcodecs: Mark functions not used outside of their files as static.
diego
parents: 30504
diff changeset
442 static void XA_2x2_OUT_1BLK_Convert(unsigned char *image_p, unsigned int x, unsigned int y,
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
443 unsigned int imagex, XA_2x2_Color *cmap2x2)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
444 {
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
445 mp_image_t *mpi = (mp_image_t *)image_p;
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
446
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
447 #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
448 SET_4_YUV_PIXELS(mpi,x,y,cmap2x2)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
449 #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
450 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
451 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
452 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
453 SET_4_YUV_PIXELS(mpi,x+2,y+2,cmap2x2)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
454 #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
455
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
456 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
457 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
458
30555
ad6740b58b0d libmpcodecs: Mark functions not used outside of their files as static.
diego
parents: 30504
diff changeset
459 static void XA_2x2_OUT_4BLKS_Convert(unsigned char *image_p, unsigned int x, unsigned int y,
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
460 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
461 XA_2x2_Color *cm3)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
462 {
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
463 mp_image_t *mpi = (mp_image_t *)image_p;
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
464
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
465 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
466 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
467 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
468 SET_4_YUV_PIXELS(mpi,x+2,y+2,cm3)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
469 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
470 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
471
30565
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
472 void *YUV2x2_Blk_Func(unsigned int image_type, int blks, unsigned int dith_flag)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
473 {
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
474 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
475 image_type, blks, dith_flag);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
476 switch(blks){
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
477 case 1:
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
478 return (void*) XA_2x2_OUT_1BLK_Convert;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
479 case 4:
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
480 return (void*) XA_2x2_OUT_4BLKS_Convert;
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 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
484 return (void*) XA_dummy;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
485 }
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 // 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
488
30555
ad6740b58b0d libmpcodecs: Mark functions not used outside of their files as static.
diego
parents: 30504
diff changeset
489 static void XA_YUV_2x2_clr(XA_2x2_Color *cmap2x2, unsigned int Y0, unsigned int Y1,
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
490 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
491 unsigned int map_flag, unsigned int *map, XA_CHDR *chdr)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
492 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
493
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
494 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
495 cmap2x2,Y0,Y1,Y2,Y3,U,V,map_flag,map,chdr);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
496
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
497 cmap2x2->clr0_0=Y0;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
498 cmap2x2->clr0_1=Y1;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
499 cmap2x2->clr0_2=Y2;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
500 cmap2x2->clr0_3=Y3;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
501 cmap2x2->clr1_0=U;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
502 cmap2x2->clr1_1=V;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
503 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
504 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
505
30565
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
506 void *YUV2x2_Map_Func(unsigned int image_type, unsigned int dith_type)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
507 {
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
508 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
509 image_type, dith_type);
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
510 return (void*)XA_YUV_2x2_clr;
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
511 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
512
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
513 /* -------------------- whole YUV frame converters ------------------------- */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
514
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
515 typedef struct
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
516 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
517 unsigned char *Ybuf;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
518 unsigned char *Ubuf;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
519 unsigned char *Vbuf;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
520 unsigned char *the_buf;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
521 unsigned int the_buf_size;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
522 unsigned short y_w, y_h;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
523 unsigned short uv_w, uv_h;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
524 } YUVBufs;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
525
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
526 typedef struct
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
527 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
528 unsigned long Uskip_mask;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
529 long *YUV_Y_tab;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
530 long *YUV_UB_tab;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
531 long *YUV_VR_tab;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
532 long *YUV_UG_tab;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
533 long *YUV_VG_tab;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
534 } YUVTabs;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
535
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
536 YUVBufs jpg_YUVBufs;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
537 YUVTabs def_yuv_tabs;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
538
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
539 /* -------------- 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
540
30555
ad6740b58b0d libmpcodecs: Mark functions not used outside of their files as static.
diego
parents: 30504
diff changeset
541 static void XA_YUV1611_Convert(unsigned char *image_p, unsigned int imagex, unsigned int imagey,
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
542 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
543 unsigned int map_flag, unsigned int *map, XA_CHDR *chdr)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
544 {
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
545 sh_video_t *sh = (sh_video_t*)image_p;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
546 vd_xanim_ctx *priv = sh->context;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
547 mp_image_t *mpi;
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
548 int y;
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
549 int ystride=(yuv->y_w)?yuv->y_w:imagex;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
550 int uvstride=(yuv->uv_w)?yuv->uv_w:(imagex/4);
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
551
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
552 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
553 yuv_tabs->YUV_Y_tab,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
554 yuv_tabs->YUV_UB_tab,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
555 yuv_tabs->YUV_VR_tab,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
556 yuv_tabs->YUV_UG_tab,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
557 yuv_tabs->YUV_VG_tab );
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
558
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
559 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
560 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
561
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
562 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
563 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
564 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
565
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
566 if(!yuv_tabs->YUV_Y_tab){
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
567 // standard YVU9 - simply export it!
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
568 mpi = mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0,
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
569 sh->disp_w, sh->disp_h);
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
570 priv->mpi=mpi; if(!mpi) return; // ERROR!
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
571 mpi->planes[0]=yuv->Ybuf;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
572 mpi->planes[1]=yuv->Ubuf;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
573 mpi->planes[2]=yuv->Vbuf;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
574 mpi->width=imagex;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
575 mpi->stride[0]=ystride; //i_x; // yuv->y_w
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
576 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
577 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
578 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
579
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
580 // allocate TEMP buffer and convert the image:
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
581 mpi = mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
582 sh->disp_w, sh->disp_h);
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
583 priv->mpi=mpi; if(!mpi) return; // ERROR!
7285
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 // convert the Y plane:
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
586 for(y=0;y<(int)imagey;y++){
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
587 unsigned int x;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
588 unsigned char* s=yuv->Ybuf+ystride*y;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
589 unsigned char* d=mpi->planes[0]+mpi->stride[0]*y;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
590 for(x=0;x<imagex;x++) d[x]=s[x]<<1;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
591 }
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
592
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
593 imagex>>=2;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
594 imagey>>=2;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
595
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
596 // 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
597 for(y=0;y<(int)imagey;y++){
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
598 unsigned int x;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
599 unsigned char* s=yuv->Ubuf+uvstride*y;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
600 unsigned char* d=mpi->planes[1]+mpi->stride[1]*y;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
601 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
602 }
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
603
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
604 // convert the V plane:
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
605 for(y=0;y<(int)imagey;y++){
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
606 unsigned int x;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
607 unsigned char* s=yuv->Vbuf+uvstride*y;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
608 unsigned char* d=mpi->planes[2]+mpi->stride[2]*y;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
609 for(x=0;x<imagex;x++) d[x]=s[x]<<1;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
610 }
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
611 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
612
30565
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
613 void *XA_YUV1611_Func(unsigned int image_type)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
614 {
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
615 mp_dbg(MSGT_DECVIDEO,MSGL_DBG2, "XA_YUV1611_Func('image_type: %d')", image_type);
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
616 return (void *)XA_YUV1611_Convert;
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
617 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
618
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
619 /* --------------- YUV 2x2 1x1 1x1 (4:2:0 aka YV12) [3ivX,H263] ------------ */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
620
30555
ad6740b58b0d libmpcodecs: Mark functions not used outside of their files as static.
diego
parents: 30504
diff changeset
621 static void XA_YUV221111_Convert(unsigned char *image_p, unsigned int imagex, unsigned int imagey,
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
622 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
623 unsigned int *map, XA_CHDR *chdr)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
624 {
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
625 sh_video_t *sh = (sh_video_t*)image_p;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
626 vd_xanim_ctx *priv = sh->context;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
627 mp_image_t *mpi;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
628 // 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
629 int ystride=imagex; //(yuv->y_w)?yuv->y_w:imagex;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
630 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
631
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
632 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
633 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
634 yuv,yuv_tabs,map_flag,map,chdr);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
635
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
636 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
637 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
638 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
639
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
640 // standard YV12 - simply export it!
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
641 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
642 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
643 mpi->planes[0]=yuv->Ybuf;
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
644 mpi->planes[1]=yuv->Ubuf;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
645 mpi->planes[2]=yuv->Vbuf;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
646 mpi->width=imagex;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
647 mpi->stride[0]=ystride; //i_x; // yuv->y_w
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
648 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
649 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
650
30565
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
651 void *XA_YUV221111_Func(unsigned int image_type)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
652 {
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
653 mp_dbg(MSGT_DECVIDEO,MSGL_DBG2, "XA_YUV221111_Func('image_type: %d')\n",image_type);
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
654 return (void *)XA_YUV221111_Convert;
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
655 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
656
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
657 /* *** EOF XANIM *** */
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
658
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
659 // to set/get/query special features/parameters
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
660 static int control(sh_video_t *sh,int cmd,void* arg,...){
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
661 return CONTROL_UNKNOWN;
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
662 }
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
663
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
664 // 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
665 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
666 {
641b287f8b07 removed xacodec_driver, 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 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
668 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
669 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
670 int i;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26754
diff changeset
671
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
672 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
673 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
674 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
675 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
676 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
677
6525
0a7be46617d8 yvu9 and if09 support
alex
parents: 5272
diff changeset
678 if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YV12)) return 0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26754
diff changeset
679
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
680 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
681 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
682
641b287f8b07 removed xacodec_driver, 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 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
684 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
685
641b287f8b07 removed xacodec_driver, 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 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
687 if (xacodec_load(sh, dll) == 0)
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
688 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
689
641b287f8b07 removed xacodec_driver, 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.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
691 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
692 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
693 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
694 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
695 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
696 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
697 /* 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
698 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
699 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
700 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
701
641b287f8b07 removed xacodec_driver, 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 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
703 {
641b287f8b07 removed xacodec_driver, 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 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
705 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
706 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
707 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
708 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
709 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
710 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
711 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
712 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
713 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
714 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
715 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
716 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
717 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
718 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
719 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
720 vo_format_name(sh->codec->outfmt[sh->outfmtidx]));
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
721 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
722 }
641b287f8b07 removed xacodec_driver, 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_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
724 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
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 if (xacodec_query(sh, &codec_hdr) == 0)
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
727 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
728
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
729 // 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
730
641b287f8b07 removed xacodec_driver, 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 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
732 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
733 {
641b287f8b07 removed xacodec_driver, 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 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
735 strerror(errno));
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
736 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
737 }
641b287f8b07 removed xacodec_driver, 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 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
739 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
740 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
741 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
742 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
743 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
744 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
745 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
746 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
747 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
748 priv->decinfo->extra = codec_hdr.extra;
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 10368
diff changeset
749 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "decinfo->extra, filled by codec: %p [%s]\n",
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 10368
diff changeset
750 &priv->decinfo->extra, (char *)priv->decinfo->extra);
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
751
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
752 return 1;
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
753 }
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
754
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
755 // 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
756 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
757 {
641b287f8b07 removed xacodec_driver, 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 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
759 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
760 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
761
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
762 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
763 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
764 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
765 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
766 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
767 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
768 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
769 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
770 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
771 free(priv);
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
772 }
db86fcf25ede xanim, raw, rle added
arpi
parents:
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 // 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
775 // 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
776
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
777 // 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
778 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
779 {
641b287f8b07 removed xacodec_driver, 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 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
781 unsigned int ret;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26754
diff changeset
782
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
783 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
784 return NULL; // skipped frame
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
785
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
786 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
787
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
788 if(sh->codec->outflags[sh->outfmtidx] & CODECS_FLAG_STATIC){
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
789 // allocate static buffer for cvid-like codecs:
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26754
diff changeset
790 priv->mpi = mpcodecs_get_image(sh, MP_IMGTYPE_STATIC,
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
791 MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE,
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
792 (sh->disp_w+3)&(~3), (sh->disp_h+3)&(~3));
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
793 if (!priv->mpi) return NULL;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
794 ret = priv->dec_func((uint8_t*)priv->mpi, data, len, priv->decinfo);
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
795 } else {
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
796 // left the buffer allocation to the codecs, pass sh_video && priv
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
797 priv->mpi=NULL;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
798 ret = priv->dec_func((uint8_t*)sh, data, len, priv->decinfo);
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
799 }
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
800
641b287f8b07 removed xacodec_driver, 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 if (ret == ACT_DLTA_NORM)
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
802 return priv->mpi;
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
803
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
804 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
805 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
806 /*
641b287f8b07 removed xacodec_driver, 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 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
808 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
809 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
810 {
641b287f8b07 removed xacodec_driver, 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 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
812 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
813 }
641b287f8b07 removed xacodec_driver, 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 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
817 {
641b287f8b07 removed xacodec_driver, 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 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "xor\n");
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
819 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
820 }
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
821
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
822 /* 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
823 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
824 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
825 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
826 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
827 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
828
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
829 /* 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
830 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
831 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
832 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
833 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
834 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
835
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
836 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
837 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
838 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
839 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
840 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
841
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
842 /* 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
843 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
844 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
845 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
846 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
847 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26754
diff changeset
848
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
849 return priv->mpi;
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
850 }