Mercurial > libavcodec.hg
annotate iff.c @ 11662:33e4b0d712c8 libavcodec
Move some branches outside looped code. Should improve the generated asm (and
thus performance) slightly.
Patch by Sebastian Vater <cdgs.basty googlemail com>.
author | rbultje |
---|---|
date | Mon, 26 Apr 2010 22:38:41 +0000 |
parents | 7a5f3c94b9ad |
children | 2c69c6015a84 |
rev | line source |
---|---|
11074 | 1 /* |
2 * IFF PBM/ILBM bitmap decoder | |
3 * Copyright (c) 2010 Peter Ross <pross@xvid.org> | |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
4 * Copyright (c) 2010 Sebastian Vater <cdgs.basty@googlemail.com> |
11074 | 5 * |
6 * This file is part of FFmpeg. | |
7 * | |
8 * FFmpeg is free software; you can redistribute it and/or | |
9 * modify it under the terms of the GNU Lesser General Public | |
10 * License as published by the Free Software Foundation; either | |
11 * version 2.1 of the License, or (at your option) any later version. | |
12 * | |
13 * FFmpeg is distributed in the hope that it will be useful, | |
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
16 * Lesser General Public License for more details. | |
17 * | |
18 * You should have received a copy of the GNU Lesser General Public | |
19 * License along with FFmpeg; if not, write to the Free Software | |
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
21 */ | |
22 | |
23 /** | |
11644
7dd2a45249a9
Remove explicit filename from Doxygen @file commands.
diego
parents:
11560
diff
changeset
|
24 * @file |
11074 | 25 * IFF PBM/ILBM bitmap decoder |
26 */ | |
27 | |
28 #include "bytestream.h" | |
29 #include "avcodec.h" | |
11175 | 30 #include "get_bits.h" |
11395
5b9d41da4152
IFF: move ff_cmap_read_palette() prototype to a header file
mru
parents:
11336
diff
changeset
|
31 #include "iff.h" |
11175 | 32 |
33 typedef struct { | |
34 AVFrame frame; | |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
35 unsigned planesize; |
11175 | 36 uint8_t * planebuf; |
37 } IffContext; | |
11074 | 38 |
39 /** | |
40 * Convert CMAP buffer (stored in extradata) to lavc palette format | |
41 */ | |
42 int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal) | |
43 { | |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
44 unsigned count, i; |
11074 | 45 |
46 if (avctx->bits_per_coded_sample > 8) { | |
47 av_log(avctx, AV_LOG_ERROR, "bit_per_coded_sample > 8 not supported\n"); | |
48 return AVERROR_INVALIDDATA; | |
49 } | |
50 | |
51 count = 1 << avctx->bits_per_coded_sample; | |
52 if (avctx->extradata_size < count * 3) { | |
53 av_log(avctx, AV_LOG_ERROR, "palette data underflow\n"); | |
54 return AVERROR_INVALIDDATA; | |
55 } | |
56 for (i=0; i < count; i++) { | |
11175 | 57 pal[i] = 0xFF000000 | AV_RB24( avctx->extradata + i*3 ); |
11074 | 58 } |
59 return 0; | |
60 } | |
61 | |
62 static av_cold int decode_init(AVCodecContext *avctx) | |
63 { | |
11175 | 64 IffContext *s = avctx->priv_data; |
11480
534872e7ab38
Make iff.c:decode_init return the value returned by
stefano
parents:
11395
diff
changeset
|
65 int err; |
11074 | 66 |
11175 | 67 if (avctx->bits_per_coded_sample <= 8) { |
68 avctx->pix_fmt = PIX_FMT_PAL8; | |
69 } else if (avctx->bits_per_coded_sample <= 32) { | |
70 avctx->pix_fmt = PIX_FMT_BGR32; | |
71 } else { | |
72 return AVERROR_INVALIDDATA; | |
73 } | |
11074 | 74 |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
75 s->planesize = avctx->width >> 3; |
11175 | 76 s->planebuf = av_malloc(s->planesize + FF_INPUT_BUFFER_PADDING_SIZE); |
77 if (!s->planebuf) | |
78 return AVERROR(ENOMEM); | |
79 | |
80 s->frame.reference = 1; | |
11480
534872e7ab38
Make iff.c:decode_init return the value returned by
stefano
parents:
11395
diff
changeset
|
81 if ((err = avctx->get_buffer(avctx, &s->frame) < 0)) { |
11074 | 82 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); |
11480
534872e7ab38
Make iff.c:decode_init return the value returned by
stefano
parents:
11395
diff
changeset
|
83 return err; |
11074 | 84 } |
11175 | 85 |
86 return avctx->bits_per_coded_sample <= 8 ? | |
87 ff_cmap_read_palette(avctx, (uint32_t*)s->frame.data[1]) : 0; | |
11074 | 88 } |
89 | |
90 /** | |
11660 | 91 * Decode interleaved plane buffer up to 8bpp |
92 * @param dst Destination buffer | |
93 * @param buf Source buffer | |
94 * @param buf_size | |
95 * @param bps bits_per_coded_sample (must be <= 8) | |
96 * @param plane plane number to decode as | |
97 */ | |
98 static void decodeplane8(uint8_t *dst, const uint8_t *const buf, int buf_size, int bps, int plane) | |
99 { | |
100 GetBitContext gb; | |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
101 unsigned int i; |
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
102 const unsigned b = (buf_size * 8) + bps - 1; |
11660 | 103 init_get_bits(&gb, buf, buf_size * 8); |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
104 for(i = 0; i < b; i++) { |
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
105 dst[i] |= get_bits1(&gb) << plane; |
11660 | 106 } |
107 } | |
108 | |
109 /** | |
110 * Decode interleaved plane buffer up to 24bpp | |
11175 | 111 * @param dst Destination buffer |
112 * @param buf Source buffer | |
113 * @param buf_size | |
114 * @param bps bits_per_coded_sample | |
115 * @param plane plane number to decode as | |
11074 | 116 */ |
11660 | 117 static void decodeplane32(uint32_t *dst, const uint8_t *const buf, int buf_size, int bps, int plane) |
118 { | |
119 GetBitContext gb; | |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
120 unsigned i; |
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
121 const unsigned b = (buf_size * 8) + bps - 1; |
11660 | 122 init_get_bits(&gb, buf, buf_size * 8); |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
123 for(i = 0; i < b; i++) { |
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
124 dst[i] |= get_bits1(&gb) << plane; |
11660 | 125 } |
11074 | 126 } |
127 | |
128 static int decode_frame_ilbm(AVCodecContext *avctx, | |
129 void *data, int *data_size, | |
130 AVPacket *avpkt) | |
131 { | |
11175 | 132 IffContext *s = avctx->priv_data; |
11074 | 133 const uint8_t *buf = avpkt->data; |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
134 unsigned buf_size = avpkt->size; |
11187 | 135 const uint8_t *buf_end = buf+buf_size; |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
136 unsigned y, plane; |
11074 | 137 |
11175 | 138 if (avctx->reget_buffer(avctx, &s->frame) < 0){ |
11074 | 139 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); |
140 return -1; | |
141 } | |
142 | |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
143 if (avctx->pix_fmt == PIX_FMT_PAL8) { |
11074 | 144 for(y = 0; y < avctx->height; y++ ) { |
11175 | 145 uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ]; |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
146 memset(row, 0, avctx->width); |
11187 | 147 for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) { |
148 decodeplane8(row, buf, FFMIN(s->planesize, buf_end - buf), avctx->bits_per_coded_sample, plane); | |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
149 buf += s->planesize; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
150 } |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
151 } |
11175 | 152 } else { // PIX_FMT_BGR32 |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
153 for(y = 0; y < avctx->height; y++ ) { |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
154 uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]]; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
155 memset(row, 0, avctx->width << 2); |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
156 for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) { |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
157 decodeplane32((uint32_t *) row, buf, FFMIN(s->planesize, buf_end - buf), avctx->bits_per_coded_sample, plane); |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
158 buf += s->planesize; |
11175 | 159 } |
11074 | 160 } |
161 } | |
162 | |
163 *data_size = sizeof(AVFrame); | |
11175 | 164 *(AVFrame*)data = s->frame; |
11074 | 165 return buf_size; |
166 } | |
167 | |
168 static int decode_frame_byterun1(AVCodecContext *avctx, | |
169 void *data, int *data_size, | |
170 AVPacket *avpkt) | |
171 { | |
11175 | 172 IffContext *s = avctx->priv_data; |
11074 | 173 const uint8_t *buf = avpkt->data; |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
174 unsigned buf_size = avpkt->size; |
11074 | 175 const uint8_t *buf_end = buf+buf_size; |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
176 unsigned y, plane, x; |
11074 | 177 |
11175 | 178 if (avctx->reget_buffer(avctx, &s->frame) < 0){ |
11074 | 179 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); |
180 return -1; | |
181 } | |
182 | |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
183 if (avctx->codec_tag == MKTAG('I','L','B','M')) { //interleaved |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
184 if (avctx->pix_fmt == PIX_FMT_PAL8) { |
11074 | 185 for(y = 0; y < avctx->height ; y++ ) { |
11175 | 186 uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ]; |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
187 memset(row, 0, avctx->width); |
11074 | 188 for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) { |
11175 | 189 for(x = 0; x < s->planesize && buf < buf_end; ) { |
11124
85a1b00a2413
Use int8_t instead of char, the signedness of char can differ between systems.
reimar
parents:
11074
diff
changeset
|
190 int8_t value = *buf++; |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
191 unsigned length; |
11074 | 192 if (value >= 0) { |
193 length = value + 1; | |
11175 | 194 memcpy(s->planebuf + x, buf, FFMIN3(length, s->planesize - x, buf_end - buf)); |
11074 | 195 buf += length; |
196 } else if (value > -128) { | |
197 length = -value + 1; | |
11175 | 198 memset(s->planebuf + x, *buf++, FFMIN(length, s->planesize - x)); |
11074 | 199 } else { //noop |
200 continue; | |
201 } | |
202 x += length; | |
203 } | |
11175 | 204 decodeplane8(row, s->planebuf, s->planesize, avctx->bits_per_coded_sample, plane); |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
205 } |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
206 } |
11175 | 207 } else { //PIX_FMT_BGR32 |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
208 for(y = 0; y < avctx->height ; y++ ) { |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
209 uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]]; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
210 memset(row, 0, avctx->width << 2); |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
211 for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) { |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
212 for(x = 0; x < s->planesize && buf < buf_end; ) { |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
213 int8_t value = *buf++; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
214 unsigned length; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
215 if (value >= 0) { |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
216 length = value + 1; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
217 memcpy(s->planebuf + x, buf, FFMIN3(length, s->planesize - x, buf_end - buf)); |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
218 buf += length; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
219 } else if (value > -128) { |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
220 length = -value + 1; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
221 memset(s->planebuf + x, *buf++, FFMIN(length, s->planesize - x)); |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
222 } else { // noop |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
223 continue; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
224 } |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
225 x += length; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
226 } |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
227 decodeplane32((uint32_t *) row, s->planebuf, s->planesize, avctx->bits_per_coded_sample, plane); |
11175 | 228 } |
11074 | 229 } |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
230 } |
11074 | 231 } else { |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
232 for(y = 0; y < avctx->height ; y++ ) { |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
233 uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]]; |
11074 | 234 for(x = 0; x < avctx->width && buf < buf_end; ) { |
11124
85a1b00a2413
Use int8_t instead of char, the signedness of char can differ between systems.
reimar
parents:
11074
diff
changeset
|
235 int8_t value = *buf++; |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
236 unsigned length; |
11074 | 237 if (value >= 0) { |
238 length = value + 1; | |
239 memcpy(row + x, buf, FFMIN3(length, buf_end - buf, avctx->width - x)); | |
240 buf += length; | |
241 } else if (value > -128) { | |
242 length = -value + 1; | |
243 memset(row + x, *buf++, FFMIN(length, avctx->width - x)); | |
244 } else { //noop | |
245 continue; | |
246 } | |
247 x += length; | |
248 } | |
249 } | |
250 } | |
251 | |
252 *data_size = sizeof(AVFrame); | |
11175 | 253 *(AVFrame*)data = s->frame; |
11074 | 254 return buf_size; |
255 } | |
256 | |
257 static av_cold int decode_end(AVCodecContext *avctx) | |
258 { | |
11175 | 259 IffContext *s = avctx->priv_data; |
260 if (s->frame.data[0]) | |
261 avctx->release_buffer(avctx, &s->frame); | |
262 av_freep(&s->planebuf); | |
11074 | 263 return 0; |
264 } | |
265 | |
266 AVCodec iff_ilbm_decoder = { | |
267 "iff_ilbm", | |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
11480
diff
changeset
|
268 AVMEDIA_TYPE_VIDEO, |
11074 | 269 CODEC_ID_IFF_ILBM, |
11175 | 270 sizeof(IffContext), |
11074 | 271 decode_init, |
272 NULL, | |
273 decode_end, | |
274 decode_frame_ilbm, | |
275 CODEC_CAP_DR1, | |
276 .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"), | |
277 }; | |
278 | |
279 AVCodec iff_byterun1_decoder = { | |
280 "iff_byterun1", | |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
11480
diff
changeset
|
281 AVMEDIA_TYPE_VIDEO, |
11074 | 282 CODEC_ID_IFF_BYTERUN1, |
11175 | 283 sizeof(IffContext), |
11074 | 284 decode_init, |
285 NULL, | |
286 decode_end, | |
287 decode_frame_byterun1, | |
288 CODEC_CAP_DR1, | |
289 .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"), | |
290 }; |