annotate libmpcodecs/vd_xanim.c @ 33010:fafbc46915db

Change MP_IMGFLAG_ACCEPT_STRIDE to MP_IMGFLAG_ACCEPT_ALIGNED_STRIDE as various FFmpeg assembly routines assume aligned input.
author zuxy
date Wed, 23 Mar 2011 14:52:13 +0000
parents 8fa2f43cb760
children 25667edae85c
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"
30901
76a13038105e Rename get_path.[ch] --> path.[ch].
diego
parents: 30900
diff changeset
32 #include "path.h"
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"
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
36
30504
cc27da5d7286 Mark all ad_info_t/vd_info_t structure declarations as const.
diego
parents: 30421
diff changeset
37 static const vd_info_t info = {
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
38 "XAnim codecs",
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
39 "xanim",
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
40 "A'rpi & Alex",
5272
edb622813c46 added xanim url
alex
parents: 5124
diff changeset
41 "Xanim (http://xanim.va.pubnix.com/)",
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
42 "binary codec plugins"
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
43 };
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
44
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
45 LIBVD_EXTERN(xanim)
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
46
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
47 #ifdef __FreeBSD__
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
48 #include <unistd.h>
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
49 #endif
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
50
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
51 #include <dlfcn.h> /* dlsym, dlopen, dlclose */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
52 #include <stdarg.h> /* va_alist, va_start, va_end */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
53 #include <errno.h> /* strerror, errno */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
54
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
55 #include "mp_msg.h"
26542
3a2e8ae7c548 Consistently #include mpbswap.h instead of bswap.h everywhere.
diego
parents: 23375
diff changeset
56 #include "mpbswap.h"
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
57
9380
edfe34c5405d linux->osdep
arpi
parents: 7383
diff changeset
58 #include "osdep/timer.h"
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
59
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
60 #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
61 /* 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
62 #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
63 #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
64 #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
65 #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
66 #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
67 #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
68 #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
69 #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
70 #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
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
31545
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
73 struct XA_CODEC_HDR;
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
74 struct XA_DEC_INFO;
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
75
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
76 typedef long init_function(struct XA_CODEC_HDR *);
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
77 typedef unsigned int decode_function(unsigned char *, unsigned char *,
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
78 unsigned int, struct XA_DEC_INFO *);
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
79
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
80 typedef struct
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 unsigned int what;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
83 unsigned int id;
31545
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
84 init_function *iq_func; /* init/query function */
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
85 decode_function *dec_func; /* opt decode function */
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
86 } XAVID_FUNC_HDR;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
87
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
88 #define XAVID_WHAT_NO_MORE 0x0000
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
89 #define XAVID_AVI_QUERY 0x0001
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
90 #define XAVID_QT_QUERY 0x0002
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
91 #define XAVID_DEC_FUNC 0x0100
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
92
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
93 #define XAVID_API_REV 0x0003
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
94
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
95 typedef struct
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
96 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
97 unsigned int api_rev;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
98 char *desc;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
99 char *rev;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
100 char *copyright;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
101 char *mod_author;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
102 char *authors;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
103 unsigned int num_funcs;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
104 XAVID_FUNC_HDR *funcs;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
105 } XAVID_MOD_HDR;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
106
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
107 /* XA CODEC .. */
31545
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
108 typedef struct XA_CODEC_HDR
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
109 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
110 void *anim_hdr;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
111 unsigned int compression;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
112 unsigned int x, y;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
113 unsigned int depth;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
114 void *extra;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
115 unsigned int xapi_rev;
31545
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
116 decode_function *decoder;
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
117 char *description;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
118 unsigned int avi_ctab_flag;
31545
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
119 unsigned int (*avi_read_ext)(void);
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
120 } XA_CODEC_HDR;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
121
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
122 #define CODEC_SUPPORTED 1
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
123 #define CODEC_UNKNOWN 0
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
124 #define CODEC_UNSUPPORTED -1
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
125
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
126 /* fuckin colormap structures for xanim */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
127 typedef struct
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 unsigned short red;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
130 unsigned short green;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
131 unsigned short blue;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
132 unsigned short gray;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
133 } ColorReg;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
134
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
135 typedef struct XA_ACTION_STRUCT
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
136 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
137 int type;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
138 int cmap_rev;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
139 unsigned char *data;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
140 struct XA_ACTION_STRUCT *next;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
141 struct XA_CHDR_STRUCT *chdr;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
142 ColorReg *h_cmap;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
143 unsigned int *map;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
144 struct XA_ACTION_STRUCT *next_same_chdr;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
145 } XA_ACTION;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
146
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
147 typedef struct XA_CHDR_STRUCT
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
148 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
149 unsigned int rev;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
150 ColorReg *cmap;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
151 unsigned int csize, coff;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
152 unsigned int *map;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
153 unsigned int msize, moff;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
154 struct XA_CHDR_STRUCT *next;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
155 XA_ACTION *acts;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
156 struct XA_CHDR_STRUCT *new_chdr;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
157 } XA_CHDR;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
158
31545
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
159 typedef struct XA_DEC_INFO
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
160 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
161 unsigned int cmd;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
162 unsigned int skip_flag;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
163 unsigned int imagex, imagey; /* image buffer size */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
164 unsigned int imaged; /* image depth */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
165 XA_CHDR *chdr; /* color map header */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
166 unsigned int map_flag;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
167 unsigned int *map;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
168 unsigned int xs, ys;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
169 unsigned int xe, ye;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
170 unsigned int special;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
171 void *extra;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
172 } XA_DEC_INFO;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
173
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
174 typedef struct
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
175 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
176 unsigned int file_num;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
177 unsigned int anim_type;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
178 unsigned int imagex;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
179 unsigned int imagey;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
180 unsigned int imagec;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
181 unsigned int imaged;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
182 } XA_ANIM_HDR;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
183
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
184 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
185 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
186 void *file_handler;
31545
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
187 init_function *iq_func;
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
188 decode_function *dec_func;
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
189 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
190 } vd_xanim_ctx;
7285
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 #if 0
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
193 typedef char xaBYTE;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
194 typedef short xaSHORT;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
195 typedef int xaLONG;
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 typedef unsigned char xaUBYTE;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
198 typedef unsigned short xaUSHORT;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
199 typedef unsigned int xaULONG;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
200 #endif
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
201
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
202 #define xaFALSE 0
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
203 #define xaTRUE 1
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
204
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
205 #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
206 #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
207 #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
208 #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
209 #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
210 #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
211 #define ACT_DLTA_BAD 0x80000000
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
212
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
213 #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
214 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
215 void *xa_close_func[XA_CLOSE_FUNCS];
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
216
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
217 /* 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
218 static int xacodec_load(sh_video_t *sh, char *filename)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
219 {
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
220 vd_xanim_ctx *priv = sh->context;
31545
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
221 void *(*what_the)(void);
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
222 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
223 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
224 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
225 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
226
7383
b9a9aefe0183 removed unused code. fixed yv12+debug-mode sig11
alex
parents: 7355
diff changeset
227 // priv->file_handler = dlopen(filename, RTLD_NOW|RTLD_GLOBAL);
b9a9aefe0183 removed unused code. fixed yv12+debug-mode sig11
alex
parents: 7355
diff changeset
228 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
229 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
230 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
231 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
232 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
233 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
234 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
235 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
236 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
237 }
641b287f8b07 removed xacodec_driver, 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
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
239 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
240 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
241 {
641b287f8b07 removed xacodec_driver, 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 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
243 dlclose(priv->file_handler);
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
244 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
245 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26754
diff changeset
246
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
247 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
248 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
249 {
641b287f8b07 removed xacodec_driver, 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_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
251 dlclose(priv->file_handler);
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
252 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
253 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26754
diff changeset
254
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
255 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
256 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
257 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
258 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
259 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
260 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
261 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
262 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
263 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
264
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
265 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
266 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
267 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
268 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
269 dlclose(priv->file_handler);
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
270 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
271 }
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
272
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
273 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
274 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
275 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
276 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
277 dlclose(priv->file_handler);
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
278 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
279 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26754
diff changeset
280
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 10368
diff changeset
281 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
282 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
283 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
284 {
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 10368
diff changeset
285 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
286 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
287 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
288 {
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 10368
diff changeset
289 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
290 func[i].iq_func, func[i].id);
31545
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
291 priv->iq_func = func[i].iq_func;
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
292 }
641b287f8b07 removed xacodec_driver, 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 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
294 {
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 10368
diff changeset
295 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
296 func[i].iq_func, func[i].id);
31545
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
297 priv->iq_func = func[i].iq_func;
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
298 }
641b287f8b07 removed xacodec_driver, 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 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
300 {
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 10368
diff changeset
301 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
302 func[i].dec_func, func[i].iq_func, func[i].id);
31545
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
303 priv->dec_func = func[i].dec_func;
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 }
641b287f8b07 removed xacodec_driver, 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 }
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
306 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
307 }
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
308
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
309 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
310 {
641b287f8b07 removed xacodec_driver, 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 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
312 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
313
641b287f8b07 removed xacodec_driver, 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 #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
315 /* 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
316 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
317 {
641b287f8b07 removed xacodec_driver, 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 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
319 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
320 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
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 #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
323
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
324 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
325 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
326 {
641b287f8b07 removed xacodec_driver, 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_SUPPORTED:
31545
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
328 priv->dec_func = codec_hdr->decoder;
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 10368
diff changeset
329 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
330 codec_hdr->description, codec_hdr->decoder);
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
331 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
332 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
333 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
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 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
337 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
338 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
339 codec_hdr->description);
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
340 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
341 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
342 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
343
30565
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
344 /* 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
345 * 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
346 void XA_Print(char *fmt, ...);
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
347 void TheEnd1(char *err_mess);
31545
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
348 void XA_Add_Func_To_Free_Chain(XA_ANIM_HDR *anim_hdr, void (*function)(void));
30565
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
349 unsigned long XA_Time_Read(void);
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
350 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
351 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
352 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
353 unsigned int height, unsigned int full_flag);
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
354 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
355 unsigned int dith_flag);
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
356 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
357 void *XA_YUV1611_Func(unsigned int image_type);
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
358 void *XA_YUV221111_Func(unsigned int image_type);
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
359
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
360 void XA_Print(char *fmt, ...)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
361 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
362 va_list vallist;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
363 char buf[1024];
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 va_start(vallist, fmt);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
366 vsnprintf(buf, 1024, fmt, vallist);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
367 mp_msg(MSGT_XACODEC, MSGL_DBG2, "[xacodec] %s\n", buf);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
368 va_end(vallist);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
369
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
370 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
371 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
372
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
373 /* 0 is no debug (needed by 3ivX) */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
374 long xa_debug = 0;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
375
30565
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
376 void TheEnd1(char *err_mess)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
377 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
378 XA_Print("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
379 /* we should exit here... */
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 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
382 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
383
31545
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
384 void XA_Add_Func_To_Free_Chain(XA_ANIM_HDR *anim_hdr, void (*function)(void))
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
385 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
386 // 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
387 // 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
388 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
389 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
390 xa_close_funcs++;
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;
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
30565
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
395 unsigned long XA_Time_Read(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 return GetTimer(); //(GetRelativeTime());
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
30555
ad6740b58b0d libmpcodecs: Mark functions not used outside of their files as static.
diego
parents: 30504
diff changeset
400 static void XA_dummy(void)
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("dummy() called");
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
403 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
404
30565
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
405 void XA_Gen_YUV_Tabs(XA_ANIM_HDR *anim_hdr)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
406 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
407 XA_Print("XA_Gen_YUV_Tabs('anim_hdr: %08x')", anim_hdr);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
408 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
409 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
410
30565
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
411 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
412 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
413 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
414 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
415 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
416
30565
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
417 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
418 unsigned int height, unsigned int full_flag)
7285
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 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
421 anim_hdr, width, height, full_flag);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
422 return;
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
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
425 /* --------------- 4x4 pixel YUV block fillers [CVID] ----------------- */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
426
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
427 typedef struct
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
428 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
429 unsigned char r0, g0, b0;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
430 unsigned char r1, g1, b1;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
431 unsigned char r2, g2, b2;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
432 unsigned char r3, g3, b3;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
433 unsigned int clr0_0, clr0_1, clr0_2, clr0_3;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
434 unsigned int clr1_0, clr1_1, clr1_2, clr1_3;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
435 unsigned int clr2_0, clr2_1, clr2_2, clr2_3;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
436 unsigned int clr3_0, clr3_1, clr3_2, clr3_3;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
437 } XA_2x2_Color;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
438
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
439 #define SET_4_YUV_PIXELS(image,x,y,cmap2x2) \
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
440 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
441 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
442 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
443 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
444 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
445 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
446
30555
ad6740b58b0d libmpcodecs: Mark functions not used outside of their files as static.
diego
parents: 30504
diff changeset
447 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
448 unsigned int imagex, XA_2x2_Color *cmap2x2)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
449 {
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 mp_image_t *mpi = (mp_image_t *)image_p;
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
451
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
452 #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
453 SET_4_YUV_PIXELS(mpi,x,y,cmap2x2)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
454 #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
455 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
456 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
457 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
458 SET_4_YUV_PIXELS(mpi,x+2,y+2,cmap2x2)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
459 #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
460
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
461 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
462 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
463
30555
ad6740b58b0d libmpcodecs: Mark functions not used outside of their files as static.
diego
parents: 30504
diff changeset
464 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
465 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
466 XA_2x2_Color *cm3)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
467 {
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
468 mp_image_t *mpi = (mp_image_t *)image_p;
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
469
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
470 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
471 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
472 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
473 SET_4_YUV_PIXELS(mpi,x+2,y+2,cm3)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
474 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
475 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
476
30565
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
477 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
478 {
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
479 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
480 image_type, blks, dith_flag);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
481 switch(blks){
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
482 case 1:
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
483 return (void*) XA_2x2_OUT_1BLK_Convert;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
484 case 4:
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
485 return (void*) XA_2x2_OUT_4BLKS_Convert;
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
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
488 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
489 return (void*) XA_dummy;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
490 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
491
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
492 // 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
493
30555
ad6740b58b0d libmpcodecs: Mark functions not used outside of their files as static.
diego
parents: 30504
diff changeset
494 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
495 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
496 unsigned int map_flag, unsigned int *map, XA_CHDR *chdr)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
497 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
498
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
499 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
500 cmap2x2,Y0,Y1,Y2,Y3,U,V,map_flag,map,chdr);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
501
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
502 cmap2x2->clr0_0=Y0;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
503 cmap2x2->clr0_1=Y1;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
504 cmap2x2->clr0_2=Y2;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
505 cmap2x2->clr0_3=Y3;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
506 cmap2x2->clr1_0=U;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
507 cmap2x2->clr1_1=V;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
508 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
509 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
510
30565
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
511 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
512 {
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
513 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
514 image_type, dith_type);
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
515 return (void*)XA_YUV_2x2_clr;
7285
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
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
518 /* -------------------- whole YUV frame converters ------------------------- */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
519
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
520 typedef struct
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
521 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
522 unsigned char *Ybuf;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
523 unsigned char *Ubuf;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
524 unsigned char *Vbuf;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
525 unsigned char *the_buf;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
526 unsigned int the_buf_size;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
527 unsigned short y_w, y_h;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
528 unsigned short uv_w, uv_h;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
529 } YUVBufs;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
530
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
531 typedef struct
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
532 {
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
533 unsigned long Uskip_mask;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
534 long *YUV_Y_tab;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
535 long *YUV_UB_tab;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
536 long *YUV_VR_tab;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
537 long *YUV_UG_tab;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
538 long *YUV_VG_tab;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
539 } YUVTabs;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
540
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
541 YUVBufs jpg_YUVBufs;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
542 YUVTabs def_yuv_tabs;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
543
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
544 /* -------------- 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
545
30555
ad6740b58b0d libmpcodecs: Mark functions not used outside of their files as static.
diego
parents: 30504
diff changeset
546 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
547 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
548 unsigned int map_flag, unsigned int *map, XA_CHDR *chdr)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
549 {
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
550 sh_video_t *sh = (sh_video_t*)image_p;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
551 vd_xanim_ctx *priv = sh->context;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
552 mp_image_t *mpi;
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
553 int y;
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
554 int ystride=(yuv->y_w)?yuv->y_w:imagex;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
555 int uvstride=(yuv->uv_w)?yuv->uv_w:(imagex/4);
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
556
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
557 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
558 yuv_tabs->YUV_Y_tab,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
559 yuv_tabs->YUV_UB_tab,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
560 yuv_tabs->YUV_VR_tab,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
561 yuv_tabs->YUV_UG_tab,
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
562 yuv_tabs->YUV_VG_tab );
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
563
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
564 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
565 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
566
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
567 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
568 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
569 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
570
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
571 if(!yuv_tabs->YUV_Y_tab){
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
572 // standard YVU9 - simply export it!
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
573 mpi = mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0,
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
574 sh->disp_w, sh->disp_h);
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
575 priv->mpi=mpi; if(!mpi) return; // ERROR!
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
576 mpi->planes[0]=yuv->Ybuf;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
577 mpi->planes[1]=yuv->Ubuf;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
578 mpi->planes[2]=yuv->Vbuf;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
579 mpi->width=imagex;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
580 mpi->stride[0]=ystride; //i_x; // yuv->y_w
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
581 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
582 return;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
583 }
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 // allocate TEMP buffer and convert the image:
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
586 mpi = mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
587 sh->disp_w, sh->disp_h);
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
588 priv->mpi=mpi; if(!mpi) return; // ERROR!
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
589
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
590 // convert the Y plane:
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
591 for(y=0;y<(int)imagey;y++){
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
592 unsigned int x;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
593 unsigned char* s=yuv->Ybuf+ystride*y;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
594 unsigned char* d=mpi->planes[0]+mpi->stride[0]*y;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
595 for(x=0;x<imagex;x++) d[x]=s[x]<<1;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
596 }
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
597
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
598 imagex>>=2;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
599 imagey>>=2;
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
600
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
601 // 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
602 for(y=0;y<(int)imagey;y++){
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
603 unsigned int x;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
604 unsigned char* s=yuv->Ubuf+uvstride*y;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
605 unsigned char* d=mpi->planes[1]+mpi->stride[1]*y;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
606 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
607 }
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
608
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
609 // convert the V plane:
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
610 for(y=0;y<(int)imagey;y++){
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
611 unsigned int x;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
612 unsigned char* s=yuv->Vbuf+uvstride*y;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
613 unsigned char* d=mpi->planes[2]+mpi->stride[2]*y;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
614 for(x=0;x<imagex;x++) d[x]=s[x]<<1;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
615 }
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
616 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
617
30565
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
618 void *XA_YUV1611_Func(unsigned int image_type)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
619 {
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
620 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
621 return (void *)XA_YUV1611_Convert;
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
622 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
623
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
624 /* --------------- YUV 2x2 1x1 1x1 (4:2:0 aka YV12) [3ivX,H263] ------------ */
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
625
30555
ad6740b58b0d libmpcodecs: Mark functions not used outside of their files as static.
diego
parents: 30504
diff changeset
626 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
627 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
628 unsigned int *map, XA_CHDR *chdr)
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
629 {
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
630 sh_video_t *sh = (sh_video_t*)image_p;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
631 vd_xanim_ctx *priv = sh->context;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
632 mp_image_t *mpi;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
633 // 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
634 int ystride=imagex; //(yuv->y_w)?yuv->y_w:imagex;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
635 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
636
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
637 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
638 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
639 yuv,yuv_tabs,map_flag,map,chdr);
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
640
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
641 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
642 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
643 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
644
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
645 // standard YV12 - simply export it!
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
646 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
647 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
648 mpi->planes[0]=yuv->Ybuf;
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
649 mpi->planes[1]=yuv->Ubuf;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
650 mpi->planes[2]=yuv->Vbuf;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
651 mpi->width=imagex;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
652 mpi->stride[0]=ystride; //i_x; // yuv->y_w
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
653 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
654 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
655
30565
6e85fdf79584 Revert marking seemingly unused XAnim-binary-related functions as static.
diego
parents: 30555
diff changeset
656 void *XA_YUV221111_Func(unsigned int image_type)
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
657 {
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
658 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
659 return (void *)XA_YUV221111_Convert;
7285
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
660 }
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
661
46336b8e7a28 merged xacodec.c and vd_xanim.c
alex
parents: 7180
diff changeset
662 /* *** EOF XANIM *** */
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
663
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
664 // to set/get/query special features/parameters
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
665 static int control(sh_video_t *sh,int cmd,void* arg,...){
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
666 return CONTROL_UNKNOWN;
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
667 }
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
668
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
669 // 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
670 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
671 {
641b287f8b07 removed xacodec_driver, 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 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
673 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
674 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
675 int i;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26754
diff changeset
676
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
677 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
678 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
679 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
680 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
681 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
682
6525
0a7be46617d8 yvu9 and if09 support
alex
parents: 5272
diff changeset
683 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
684
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
685 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
686 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
687
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
688 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
689 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
690
30907
b32527b30d17 Get rid of pointless def_path variable; use codec_path directly instead.
diego
parents: 30901
diff changeset
691 snprintf(dll, 1024, "%s/%s", codec_path, sh->codec->dll);
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
692 if (xacodec_load(sh, dll) == 0)
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
693 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
694
641b287f8b07 removed xacodec_driver, 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.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
696 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
697 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
698 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
699 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
700 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
701 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
702 /* 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
703 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
704 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
705 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
706
641b287f8b07 removed xacodec_driver, 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 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
708 {
641b287f8b07 removed xacodec_driver, 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 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
710 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
711 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
712 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
713 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
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_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
716 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
717 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
718 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
719 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
720 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
721 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
722 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
723 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
724 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
725 vo_format_name(sh->codec->outfmt[sh->outfmtidx]));
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
726 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
727 }
641b287f8b07 removed xacodec_driver, 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 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
729 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
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 if (xacodec_query(sh, &codec_hdr) == 0)
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
732 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
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 // 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
735
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
736 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
737 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
738 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
739 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
740 strerror(errno));
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
741 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
742 }
641b287f8b07 removed xacodec_driver, 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->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
744 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
745 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
746 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
747 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
748 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
749 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
750 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
751 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
752 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
753 priv->decinfo->extra = codec_hdr.extra;
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 10368
diff changeset
754 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
755 &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
756
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 26542
diff changeset
757 return 1;
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
758 }
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
759
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
760 // 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
761 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
762 {
641b287f8b07 removed xacodec_driver, 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 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
764 int i;
31545
4500ce87a70c Give functions proper prototypes.
reimar
parents: 30907
diff changeset
765 void (*close_func)(void);
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
766
641b287f8b07 removed xacodec_driver, 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 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
768 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
769 {
641b287f8b07 removed xacodec_driver, 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 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
771 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
772 }
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
773 dlclose(priv->file_handler);
32537
8fa2f43cb760 Remove most of the NULL pointer check before free all over the code
cboesch
parents: 31545
diff changeset
774 free(priv->decinfo);
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
775 free(priv);
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
776 }
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
777
7298
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
778 // 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
779 // 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
780
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
781 // 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
782 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
783 {
641b287f8b07 removed xacodec_driver, 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 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
785 unsigned int ret;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26754
diff changeset
786
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
787 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
788 return NULL; // skipped frame
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
789
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
790 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
791
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
792 if(sh->codec->outflags[sh->outfmtidx] & CODECS_FLAG_STATIC){
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
793 // allocate static buffer for cvid-like codecs:
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26754
diff changeset
794 priv->mpi = mpcodecs_get_image(sh, MP_IMGTYPE_STATIC,
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
795 MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE,
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
796 (sh->disp_w+3)&(~3), (sh->disp_h+3)&(~3));
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
797 if (!priv->mpi) return NULL;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
798 ret = priv->dec_func((uint8_t*)priv->mpi, data, len, priv->decinfo);
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
799 } else {
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
800 // left the buffer allocation to the codecs, pass sh_video && priv
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
801 priv->mpi=NULL;
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
802 ret = priv->dec_func((uint8_t*)sh, data, len, priv->decinfo);
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
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
641b287f8b07 removed xacodec_driver, 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 if (ret == ACT_DLTA_NORM)
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
806 return priv->mpi;
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
807
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
808 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
809 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
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 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
812 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
813 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
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 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
816 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
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 */
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
819
641b287f8b07 removed xacodec_driver, 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 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
821 {
641b287f8b07 removed xacodec_driver, 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 mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "xor\n");
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
823 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
824 }
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
825
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
826 /* 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
827 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
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 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
830 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
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
641b287f8b07 removed xacodec_driver, 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 /* 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
834 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
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 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
837 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
838 }
641b287f8b07 removed xacodec_driver, 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
641b287f8b07 removed xacodec_driver, 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 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
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 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
843 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
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
641b287f8b07 removed xacodec_driver, 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 /* 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
847 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
848 {
641b287f8b07 removed xacodec_driver, using sh->context instead, removed xacodec_image, using mpi instead, some warning fixes. note: mpi optimisations are still pending
alex
parents: 7285
diff changeset
849 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
850 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
851 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26754
diff changeset
852
7355
04df35721744 - some cleanup, unused code removed
arpi
parents: 7298
diff changeset
853 return priv->mpi;
4969
db86fcf25ede xanim, raw, rle added
arpi
parents:
diff changeset
854 }