Mercurial > libavcodec.hg
annotate txd.c @ 12494:94eaea836bf4 libavcodec
Check avctx width/height more thoroughly (e.g. all values 0 except width would
have been accepted before).
Also do not fail if they are invalid but instead override them to 0.
This allows decoding e.g. MPEG video when only the container values are corrupted.
For encoding a value of 0,0 of course makes no sense, but was allowed
through before and will be caught by an extra check in the encode function.
author | reimar |
---|---|
date | Wed, 15 Sep 2010 04:46:55 +0000 |
parents | ffb3668ff7af |
children |
rev | line source |
---|---|
4934 | 1 /* |
2 * Renderware TeXture Dictionary (.txd) image decoder | |
3 * Copyright (c) 2007 Ivo van Poorten | |
4 * | |
5214 | 5 * See also: http://wiki.multimedia.cx/index.php?title=TXD |
6 * | |
4934 | 7 * This file is part of FFmpeg. |
8 * | |
9 * FFmpeg is free software; you can redistribute it and/or | |
10 * modify it under the terms of the GNU Lesser General Public | |
11 * License as published by the Free Software Foundation; either | |
12 * version 2.1 of the License, or (at your option) any later version. | |
13 * | |
14 * FFmpeg is distributed in the hope that it will be useful, | |
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
17 * Lesser General Public License for more details. | |
18 * | |
19 * You should have received a copy of the GNU Lesser General Public | |
20 * License along with FFmpeg; if not, write to the Free Software | |
21 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
22 */ | |
23 | |
8573
2acf0ae7b041
Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
diego
parents:
7040
diff
changeset
|
24 #include "libavutil/intreadwrite.h" |
12372
914f484bb476
Remove use of the deprecated function avcodec_check_dimensions(), use
stefano
parents:
11560
diff
changeset
|
25 #include "libavcore/imgutils.h" |
4934 | 26 #include "avcodec.h" |
27 #include "s3tc.h" | |
28 | |
29 typedef struct TXDContext { | |
30 AVFrame picture; | |
31 } TXDContext; | |
32 | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6288
diff
changeset
|
33 static av_cold int txd_init(AVCodecContext *avctx) { |
4934 | 34 TXDContext *s = avctx->priv_data; |
35 | |
36 avcodec_get_frame_defaults(&s->picture); | |
37 avctx->coded_frame = &s->picture; | |
38 | |
39 return 0; | |
40 } | |
41 | |
42 static int txd_decode_frame(AVCodecContext *avctx, void *data, int *data_size, | |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
8573
diff
changeset
|
43 AVPacket *avpkt) { |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
8573
diff
changeset
|
44 const uint8_t *buf = avpkt->data; |
4934 | 45 TXDContext * const s = avctx->priv_data; |
46 AVFrame *picture = data; | |
47 AVFrame * const p = &s->picture; | |
48 unsigned int version, w, h, d3d_format, depth, stride, mipmap_count, flags; | |
49 unsigned int y, v; | |
6288 | 50 uint8_t *ptr; |
51 const uint8_t *cur = buf; | |
52 const uint32_t *palette = (const uint32_t *)(cur + 88); | |
53 uint32_t *pal; | |
4934 | 54 |
55 version = AV_RL32(cur); | |
56 d3d_format = AV_RL32(cur+76); | |
57 w = AV_RL16(cur+80); | |
58 h = AV_RL16(cur+82); | |
59 depth = AV_RL8 (cur+84); | |
60 mipmap_count = AV_RL8 (cur+85); | |
61 flags = AV_RL8 (cur+87); | |
62 cur += 92; | |
63 | |
64 if (version < 8 || version > 9) { | |
65 av_log(avctx, AV_LOG_ERROR, "texture data version %i is unsupported\n", | |
66 version); | |
67 return -1; | |
68 } | |
69 | |
70 if (depth == 8) { | |
71 avctx->pix_fmt = PIX_FMT_PAL8; | |
72 cur += 1024; | |
73 } else if (depth == 16 || depth == 32) | |
74 avctx->pix_fmt = PIX_FMT_RGB32; | |
75 else { | |
76 av_log(avctx, AV_LOG_ERROR, "depth of %i is unsupported\n", depth); | |
77 return -1; | |
78 } | |
79 | |
80 if (p->data[0]) | |
81 avctx->release_buffer(avctx, p); | |
82 | |
12462
ffb3668ff7af
Use new imgutils.h API names, fix deprecation warnings.
stefano
parents:
12372
diff
changeset
|
83 if (av_image_check_size(w, h, 0, avctx)) |
4934 | 84 return -1; |
85 if (w != avctx->width || h != avctx->height) | |
86 avcodec_set_dimensions(avctx, w, h); | |
87 if (avctx->get_buffer(avctx, p) < 0) { | |
88 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); | |
89 return -1; | |
90 } | |
91 | |
92 p->pict_type = FF_I_TYPE; | |
93 | |
94 ptr = p->data[0]; | |
95 stride = p->linesize[0]; | |
96 | |
97 if (depth == 8) { | |
98 pal = (uint32_t *) p->data[1]; | |
99 for (y=0; y<256; y++) { | |
100 v = AV_RB32(palette+y); | |
101 pal[y] = (v>>8) + (v<<24); | |
102 } | |
103 for (y=0; y<h; y++) { | |
104 memcpy(ptr, cur, w); | |
105 ptr += stride; | |
106 cur += w; | |
107 } | |
108 } else if (depth == 16) { | |
109 switch (d3d_format) { | |
110 case 0: | |
111 if (!flags&1) goto unsupported; | |
112 case FF_S3TC_DXT1: | |
113 ff_decode_dxt1(cur, ptr, w, h, stride); | |
114 break; | |
115 case FF_S3TC_DXT3: | |
116 ff_decode_dxt3(cur, ptr, w, h, stride); | |
117 break; | |
118 default: | |
119 goto unsupported; | |
120 } | |
121 } else if (depth == 32) { | |
122 switch (d3d_format) { | |
123 case 0x15: | |
124 case 0x16: | |
125 for (y=0; y<h; y++) { | |
126 memcpy(ptr, cur, w*4); | |
127 ptr += stride; | |
128 cur += w*4; | |
129 } | |
130 break; | |
131 default: | |
132 goto unsupported; | |
133 } | |
134 } | |
135 | |
136 for (; mipmap_count > 1; mipmap_count--) | |
137 cur += AV_RL32(cur) + 4; | |
138 | |
139 *picture = s->picture; | |
140 *data_size = sizeof(AVPicture); | |
141 | |
142 return cur - buf; | |
143 | |
144 unsupported: | |
145 av_log(avctx, AV_LOG_ERROR, "unsupported d3d format (%08x)\n", d3d_format); | |
146 return -1; | |
147 } | |
148 | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6288
diff
changeset
|
149 static av_cold int txd_end(AVCodecContext *avctx) { |
4934 | 150 TXDContext *s = avctx->priv_data; |
151 | |
152 if (s->picture.data[0]) | |
153 avctx->release_buffer(avctx, &s->picture); | |
154 | |
155 return 0; | |
156 } | |
157 | |
158 AVCodec txd_decoder = { | |
159 "txd", | |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
9814
diff
changeset
|
160 AVMEDIA_TYPE_VIDEO, |
4934 | 161 CODEC_ID_TXD, |
162 sizeof(TXDContext), | |
163 txd_init, | |
164 NULL, | |
165 txd_end, | |
166 txd_decode_frame, | |
9814
f2fb80b9952a
renderware txd image decoder uses get_buffer, set CODEC_CAP_DR1
bcoudurier
parents:
9385
diff
changeset
|
167 CODEC_CAP_DR1, |
6722 | 168 NULL, |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6722
diff
changeset
|
169 .long_name = NULL_IF_CONFIG_SMALL("Renderware TXD (TeXture Dictionary) image"), |
4934 | 170 }; |