Mercurial > libavcodec.hg
annotate iff.c @ 11699:83b49b0997e8 libavcodec
Ensure that width and height are > 0. avcodec_open() itself only checks that
they are >= 0.
Patch by Sebastian Vater <cdgs basty googlemail com>.
author | rbultje |
---|---|
date | Mon, 10 May 2010 17:00:56 +0000 |
parents | 3ec57be57312 |
children | 6bdec2a0e7e1 |
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; | |
11678
e1dd1ff1ab27
Revert r22974 int->unsigned parts that don't have any meaningful effect.
rbultje
parents:
11663
diff
changeset
|
35 int planesize; |
11175 | 36 uint8_t * planebuf; |
37 } IffContext; | |
11074 | 38 |
11691
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
39 #define LUT8_PART(plane, v) \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
40 AV_LE2ME64C(UINT64_C(0x0000000)<<32 | v) << plane, \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
41 AV_LE2ME64C(UINT64_C(0x1000000)<<32 | v) << plane, \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
42 AV_LE2ME64C(UINT64_C(0x0010000)<<32 | v) << plane, \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
43 AV_LE2ME64C(UINT64_C(0x1010000)<<32 | v) << plane, \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
44 AV_LE2ME64C(UINT64_C(0x0000100)<<32 | v) << plane, \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
45 AV_LE2ME64C(UINT64_C(0x1000100)<<32 | v) << plane, \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
46 AV_LE2ME64C(UINT64_C(0x0010100)<<32 | v) << plane, \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
47 AV_LE2ME64C(UINT64_C(0x1010100)<<32 | v) << plane, \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
48 AV_LE2ME64C(UINT64_C(0x0000001)<<32 | v) << plane, \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
49 AV_LE2ME64C(UINT64_C(0x1000001)<<32 | v) << plane, \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
50 AV_LE2ME64C(UINT64_C(0x0010001)<<32 | v) << plane, \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
51 AV_LE2ME64C(UINT64_C(0x1010001)<<32 | v) << plane, \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
52 AV_LE2ME64C(UINT64_C(0x0000101)<<32 | v) << plane, \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
53 AV_LE2ME64C(UINT64_C(0x1000101)<<32 | v) << plane, \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
54 AV_LE2ME64C(UINT64_C(0x0010101)<<32 | v) << plane, \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
55 AV_LE2ME64C(UINT64_C(0x1010101)<<32 | v) << plane |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
56 |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
57 #define LUT8(plane) { \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
58 LUT8_PART(plane, 0x0000000), \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
59 LUT8_PART(plane, 0x1000000), \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
60 LUT8_PART(plane, 0x0010000), \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
61 LUT8_PART(plane, 0x1010000), \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
62 LUT8_PART(plane, 0x0000100), \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
63 LUT8_PART(plane, 0x1000100), \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
64 LUT8_PART(plane, 0x0010100), \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
65 LUT8_PART(plane, 0x1010100), \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
66 LUT8_PART(plane, 0x0000001), \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
67 LUT8_PART(plane, 0x1000001), \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
68 LUT8_PART(plane, 0x0010001), \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
69 LUT8_PART(plane, 0x1010001), \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
70 LUT8_PART(plane, 0x0000101), \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
71 LUT8_PART(plane, 0x1000101), \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
72 LUT8_PART(plane, 0x0010101), \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
73 LUT8_PART(plane, 0x1010101), \ |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
74 } |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
75 |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
76 // 8 planes * 8-bit mask |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
77 static const uint64_t plane8_lut[8][256] = { |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
78 LUT8(0), LUT8(1), LUT8(2), LUT8(3), |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
79 LUT8(4), LUT8(5), LUT8(6), LUT8(7), |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
80 }; |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
81 |
11074 | 82 /** |
83 * Convert CMAP buffer (stored in extradata) to lavc palette format | |
84 */ | |
85 int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal) | |
86 { | |
11678
e1dd1ff1ab27
Revert r22974 int->unsigned parts that don't have any meaningful effect.
rbultje
parents:
11663
diff
changeset
|
87 int count, i; |
11074 | 88 |
89 if (avctx->bits_per_coded_sample > 8) { | |
90 av_log(avctx, AV_LOG_ERROR, "bit_per_coded_sample > 8 not supported\n"); | |
91 return AVERROR_INVALIDDATA; | |
92 } | |
93 | |
94 count = 1 << avctx->bits_per_coded_sample; | |
95 if (avctx->extradata_size < count * 3) { | |
96 av_log(avctx, AV_LOG_ERROR, "palette data underflow\n"); | |
97 return AVERROR_INVALIDDATA; | |
98 } | |
99 for (i=0; i < count; i++) { | |
11175 | 100 pal[i] = 0xFF000000 | AV_RB24( avctx->extradata + i*3 ); |
11074 | 101 } |
102 return 0; | |
103 } | |
104 | |
105 static av_cold int decode_init(AVCodecContext *avctx) | |
106 { | |
11175 | 107 IffContext *s = avctx->priv_data; |
11480
534872e7ab38
Make iff.c:decode_init return the value returned by
stefano
parents:
11395
diff
changeset
|
108 int err; |
11074 | 109 |
11175 | 110 if (avctx->bits_per_coded_sample <= 8) { |
111 avctx->pix_fmt = PIX_FMT_PAL8; | |
112 } else if (avctx->bits_per_coded_sample <= 32) { | |
113 avctx->pix_fmt = PIX_FMT_BGR32; | |
114 } else { | |
115 return AVERROR_INVALIDDATA; | |
116 } | |
11074 | 117 |
11699
83b49b0997e8
Ensure that width and height are > 0. avcodec_open() itself only checks that
rbultje
parents:
11693
diff
changeset
|
118 if ((err = avcodec_check_dimensions(avctx, avctx->width, avctx->height))) |
83b49b0997e8
Ensure that width and height are > 0. avcodec_open() itself only checks that
rbultje
parents:
11693
diff
changeset
|
119 return err; |
11679 | 120 s->planesize = FFALIGN(avctx->width, 16) >> 3; // Align plane size in bits to word-boundary |
11175 | 121 s->planebuf = av_malloc(s->planesize + FF_INPUT_BUFFER_PADDING_SIZE); |
122 if (!s->planebuf) | |
123 return AVERROR(ENOMEM); | |
124 | |
125 s->frame.reference = 1; | |
11480
534872e7ab38
Make iff.c:decode_init return the value returned by
stefano
parents:
11395
diff
changeset
|
126 if ((err = avctx->get_buffer(avctx, &s->frame) < 0)) { |
11074 | 127 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
|
128 return err; |
11074 | 129 } |
11175 | 130 |
131 return avctx->bits_per_coded_sample <= 8 ? | |
132 ff_cmap_read_palette(avctx, (uint32_t*)s->frame.data[1]) : 0; | |
11074 | 133 } |
134 | |
135 /** | |
11660 | 136 * Decode interleaved plane buffer up to 8bpp |
137 * @param dst Destination buffer | |
138 * @param buf Source buffer | |
139 * @param buf_size | |
140 * @param plane plane number to decode as | |
141 */ | |
11693
3ec57be57312
Remove "bps" parameter to decodeplane8/32(), it's unused.
rbultje
parents:
11692
diff
changeset
|
142 static void decodeplane8(uint8_t *dst, const uint8_t *buf, int buf_size, int plane) |
11660 | 143 { |
11691
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
144 const uint64_t *lut = plane8_lut[plane]; |
11692 | 145 while (buf_size--) { |
11691
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
146 uint64_t v = AV_RN64A(dst) | lut[*buf++]; |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
147 AV_WN64A(dst, v); |
11692 | 148 dst += 8; |
11660 | 149 } |
150 } | |
151 | |
152 /** | |
153 * Decode interleaved plane buffer up to 24bpp | |
11175 | 154 * @param dst Destination buffer |
155 * @param buf Source buffer | |
156 * @param buf_size | |
157 * @param plane plane number to decode as | |
11074 | 158 */ |
11693
3ec57be57312
Remove "bps" parameter to decodeplane8/32(), it's unused.
rbultje
parents:
11692
diff
changeset
|
159 static void decodeplane32(uint32_t *dst, const uint8_t *const buf, int buf_size, int plane) |
11660 | 160 { |
161 GetBitContext gb; | |
11678
e1dd1ff1ab27
Revert r22974 int->unsigned parts that don't have any meaningful effect.
rbultje
parents:
11663
diff
changeset
|
162 int i; |
11679 | 163 const int b = buf_size * 8; |
11660 | 164 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
|
165 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
|
166 dst[i] |= get_bits1(&gb) << plane; |
11660 | 167 } |
11074 | 168 } |
169 | |
170 static int decode_frame_ilbm(AVCodecContext *avctx, | |
171 void *data, int *data_size, | |
172 AVPacket *avpkt) | |
173 { | |
11175 | 174 IffContext *s = avctx->priv_data; |
11074 | 175 const uint8_t *buf = avpkt->data; |
11678
e1dd1ff1ab27
Revert r22974 int->unsigned parts that don't have any meaningful effect.
rbultje
parents:
11663
diff
changeset
|
176 int buf_size = avpkt->size; |
11187 | 177 const uint8_t *buf_end = buf+buf_size; |
11678
e1dd1ff1ab27
Revert r22974 int->unsigned parts that don't have any meaningful effect.
rbultje
parents:
11663
diff
changeset
|
178 int y, plane; |
11074 | 179 |
11175 | 180 if (avctx->reget_buffer(avctx, &s->frame) < 0){ |
11074 | 181 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); |
182 return -1; | |
183 } | |
184 | |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
185 if (avctx->pix_fmt == PIX_FMT_PAL8) { |
11663 | 186 for(y = 0; y < avctx->height; y++ ) { |
187 uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ]; | |
188 memset(row, 0, avctx->width); | |
189 for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) { | |
11693
3ec57be57312
Remove "bps" parameter to decodeplane8/32(), it's unused.
rbultje
parents:
11692
diff
changeset
|
190 decodeplane8(row, buf, FFMIN(s->planesize, buf_end - buf), plane); |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
191 buf += s->planesize; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
192 } |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
193 } |
11663 | 194 } else { // PIX_FMT_BGR32 |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
195 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
|
196 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
|
197 memset(row, 0, avctx->width << 2); |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
198 for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) { |
11693
3ec57be57312
Remove "bps" parameter to decodeplane8/32(), it's unused.
rbultje
parents:
11692
diff
changeset
|
199 decodeplane32((uint32_t *) row, buf, FFMIN(s->planesize, buf_end - buf), plane); |
11663 | 200 buf += s->planesize; |
11175 | 201 } |
11074 | 202 } |
203 } | |
204 | |
205 *data_size = sizeof(AVFrame); | |
11175 | 206 *(AVFrame*)data = s->frame; |
11074 | 207 return buf_size; |
208 } | |
209 | |
210 static int decode_frame_byterun1(AVCodecContext *avctx, | |
211 void *data, int *data_size, | |
212 AVPacket *avpkt) | |
213 { | |
11175 | 214 IffContext *s = avctx->priv_data; |
11074 | 215 const uint8_t *buf = avpkt->data; |
11678
e1dd1ff1ab27
Revert r22974 int->unsigned parts that don't have any meaningful effect.
rbultje
parents:
11663
diff
changeset
|
216 int buf_size = avpkt->size; |
11074 | 217 const uint8_t *buf_end = buf+buf_size; |
11678
e1dd1ff1ab27
Revert r22974 int->unsigned parts that don't have any meaningful effect.
rbultje
parents:
11663
diff
changeset
|
218 int y, plane, x; |
11074 | 219 |
11175 | 220 if (avctx->reget_buffer(avctx, &s->frame) < 0){ |
11074 | 221 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); |
222 return -1; | |
223 } | |
224 | |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
225 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
|
226 if (avctx->pix_fmt == PIX_FMT_PAL8) { |
11663 | 227 for(y = 0; y < avctx->height ; y++ ) { |
228 uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ]; | |
229 memset(row, 0, avctx->width); | |
230 for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) { | |
231 for(x = 0; x < s->planesize && buf < buf_end; ) { | |
232 int8_t value = *buf++; | |
233 unsigned length; | |
234 if (value >= 0) { | |
235 length = value + 1; | |
236 memcpy(s->planebuf + x, buf, FFMIN3(length, s->planesize - x, buf_end - buf)); | |
237 buf += length; | |
238 } else if (value > -128) { | |
239 length = -value + 1; | |
240 memset(s->planebuf + x, *buf++, FFMIN(length, s->planesize - x)); | |
241 } else { //noop | |
242 continue; | |
243 } | |
244 x += length; | |
11074 | 245 } |
11693
3ec57be57312
Remove "bps" parameter to decodeplane8/32(), it's unused.
rbultje
parents:
11692
diff
changeset
|
246 decodeplane8(row, s->planebuf, s->planesize, plane); |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
247 } |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
248 } |
11663 | 249 } else { //PIX_FMT_BGR32 |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
250 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
|
251 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
|
252 memset(row, 0, avctx->width << 2); |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
253 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
|
254 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
|
255 int8_t value = *buf++; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
256 unsigned length; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
257 if (value >= 0) { |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
258 length = value + 1; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
259 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
|
260 buf += length; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
261 } else if (value > -128) { |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
262 length = -value + 1; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
263 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
|
264 } else { // noop |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
265 continue; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
266 } |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
267 x += length; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
268 } |
11693
3ec57be57312
Remove "bps" parameter to decodeplane8/32(), it's unused.
rbultje
parents:
11692
diff
changeset
|
269 decodeplane32((uint32_t *) row, s->planebuf, s->planesize, plane); |
11175 | 270 } |
11074 | 271 } |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
272 } |
11663 | 273 } else { |
274 for(y = 0; y < avctx->height ; y++ ) { | |
275 uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]]; | |
11074 | 276 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
|
277 int8_t value = *buf++; |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
278 unsigned length; |
11074 | 279 if (value >= 0) { |
280 length = value + 1; | |
281 memcpy(row + x, buf, FFMIN3(length, buf_end - buf, avctx->width - x)); | |
282 buf += length; | |
283 } else if (value > -128) { | |
284 length = -value + 1; | |
285 memset(row + x, *buf++, FFMIN(length, avctx->width - x)); | |
286 } else { //noop | |
287 continue; | |
288 } | |
289 x += length; | |
290 } | |
291 } | |
292 } | |
293 | |
294 *data_size = sizeof(AVFrame); | |
11175 | 295 *(AVFrame*)data = s->frame; |
11074 | 296 return buf_size; |
297 } | |
298 | |
299 static av_cold int decode_end(AVCodecContext *avctx) | |
300 { | |
11175 | 301 IffContext *s = avctx->priv_data; |
302 if (s->frame.data[0]) | |
303 avctx->release_buffer(avctx, &s->frame); | |
304 av_freep(&s->planebuf); | |
11074 | 305 return 0; |
306 } | |
307 | |
308 AVCodec iff_ilbm_decoder = { | |
309 "iff_ilbm", | |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
11480
diff
changeset
|
310 AVMEDIA_TYPE_VIDEO, |
11074 | 311 CODEC_ID_IFF_ILBM, |
11175 | 312 sizeof(IffContext), |
11074 | 313 decode_init, |
314 NULL, | |
315 decode_end, | |
316 decode_frame_ilbm, | |
317 CODEC_CAP_DR1, | |
318 .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"), | |
319 }; | |
320 | |
321 AVCodec iff_byterun1_decoder = { | |
322 "iff_byterun1", | |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
11480
diff
changeset
|
323 AVMEDIA_TYPE_VIDEO, |
11074 | 324 CODEC_ID_IFF_BYTERUN1, |
11175 | 325 sizeof(IffContext), |
11074 | 326 decode_init, |
327 NULL, | |
328 decode_end, | |
329 decode_frame_byterun1, | |
330 CODEC_CAP_DR1, | |
331 .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"), | |
332 }; |