Mercurial > libavcodec.hg
annotate iff.c @ 11718:f2beca0bbf98 libavcodec
Handle palette underflows, fill remaining space with black (zero) data.
Patch by Sebastian Vater <cdgs basty googlemail com>.
author | rbultje |
---|---|
date | Thu, 13 May 2010 15:33:36 +0000 |
parents | 269ce565c70b |
children | 30356abc8604 |
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 |
11700 | 82 #define LUT32(plane) { \ |
83 0, 0, 0, 0, \ | |
84 0, 0, 0, 1 << plane, \ | |
85 0, 0, 1 << plane, 0, \ | |
86 0, 0, 1 << plane, 1 << plane, \ | |
87 0, 1 << plane, 0, 0, \ | |
88 0, 1 << plane, 0, 1 << plane, \ | |
89 0, 1 << plane, 1 << plane, 0, \ | |
90 0, 1 << plane, 1 << plane, 1 << plane, \ | |
91 1 << plane, 0, 0, 0, \ | |
92 1 << plane, 0, 0, 1 << plane, \ | |
93 1 << plane, 0, 1 << plane, 0, \ | |
94 1 << plane, 0, 1 << plane, 1 << plane, \ | |
95 1 << plane, 1 << plane, 0, 0, \ | |
96 1 << plane, 1 << plane, 0, 1 << plane, \ | |
97 1 << plane, 1 << plane, 1 << plane, 0, \ | |
98 1 << plane, 1 << plane, 1 << plane, 1 << plane, \ | |
99 } | |
100 | |
101 // 32 planes * 4-bit mask * 4 lookup tables each | |
102 static const uint32_t plane32_lut[32][16*4] = { | |
103 LUT32( 0), LUT32( 1), LUT32( 2), LUT32( 3), | |
104 LUT32( 4), LUT32( 5), LUT32( 6), LUT32( 7), | |
105 LUT32( 8), LUT32( 9), LUT32(10), LUT32(11), | |
106 LUT32(12), LUT32(13), LUT32(14), LUT32(15), | |
107 LUT32(16), LUT32(17), LUT32(18), LUT32(19), | |
108 LUT32(20), LUT32(21), LUT32(22), LUT32(23), | |
109 LUT32(24), LUT32(25), LUT32(26), LUT32(27), | |
110 LUT32(28), LUT32(29), LUT32(30), LUT32(31), | |
111 }; | |
112 | |
11074 | 113 /** |
114 * Convert CMAP buffer (stored in extradata) to lavc palette format | |
115 */ | |
116 int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal) | |
117 { | |
11678
e1dd1ff1ab27
Revert r22974 int->unsigned parts that don't have any meaningful effect.
rbultje
parents:
11663
diff
changeset
|
118 int count, i; |
11074 | 119 |
120 if (avctx->bits_per_coded_sample > 8) { | |
121 av_log(avctx, AV_LOG_ERROR, "bit_per_coded_sample > 8 not supported\n"); | |
122 return AVERROR_INVALIDDATA; | |
123 } | |
124 | |
125 count = 1 << avctx->bits_per_coded_sample; | |
11718
f2beca0bbf98
Handle palette underflows, fill remaining space with black (zero) data.
rbultje
parents:
11717
diff
changeset
|
126 // If extradata is smaller than actually needed, fill the remaining with black. |
f2beca0bbf98
Handle palette underflows, fill remaining space with black (zero) data.
rbultje
parents:
11717
diff
changeset
|
127 count = FFMIN(avctx->extradata_size / 3, count); |
11074 | 128 for (i=0; i < count; i++) { |
11175 | 129 pal[i] = 0xFF000000 | AV_RB24( avctx->extradata + i*3 ); |
11074 | 130 } |
131 return 0; | |
132 } | |
133 | |
134 static av_cold int decode_init(AVCodecContext *avctx) | |
135 { | |
11175 | 136 IffContext *s = avctx->priv_data; |
11480
534872e7ab38
Make iff.c:decode_init return the value returned by
stefano
parents:
11395
diff
changeset
|
137 int err; |
11074 | 138 |
11175 | 139 if (avctx->bits_per_coded_sample <= 8) { |
140 avctx->pix_fmt = PIX_FMT_PAL8; | |
141 } else if (avctx->bits_per_coded_sample <= 32) { | |
142 avctx->pix_fmt = PIX_FMT_BGR32; | |
143 } else { | |
144 return AVERROR_INVALIDDATA; | |
145 } | |
11074 | 146 |
11699
83b49b0997e8
Ensure that width and height are > 0. avcodec_open() itself only checks that
rbultje
parents:
11693
diff
changeset
|
147 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
|
148 return err; |
11679 | 149 s->planesize = FFALIGN(avctx->width, 16) >> 3; // Align plane size in bits to word-boundary |
11175 | 150 s->planebuf = av_malloc(s->planesize + FF_INPUT_BUFFER_PADDING_SIZE); |
151 if (!s->planebuf) | |
152 return AVERROR(ENOMEM); | |
153 | |
154 s->frame.reference = 1; | |
11480
534872e7ab38
Make iff.c:decode_init return the value returned by
stefano
parents:
11395
diff
changeset
|
155 if ((err = avctx->get_buffer(avctx, &s->frame) < 0)) { |
11074 | 156 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
|
157 return err; |
11074 | 158 } |
11175 | 159 |
160 return avctx->bits_per_coded_sample <= 8 ? | |
161 ff_cmap_read_palette(avctx, (uint32_t*)s->frame.data[1]) : 0; | |
11074 | 162 } |
163 | |
164 /** | |
11660 | 165 * Decode interleaved plane buffer up to 8bpp |
166 * @param dst Destination buffer | |
167 * @param buf Source buffer | |
168 * @param buf_size | |
169 * @param plane plane number to decode as | |
170 */ | |
11693
3ec57be57312
Remove "bps" parameter to decodeplane8/32(), it's unused.
rbultje
parents:
11692
diff
changeset
|
171 static void decodeplane8(uint8_t *dst, const uint8_t *buf, int buf_size, int plane) |
11660 | 172 { |
11691
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
173 const uint64_t *lut = plane8_lut[plane]; |
11717
269ce565c70b
Move a while(..){..} -> do{..}while(..), slightly faster.
rbultje
parents:
11700
diff
changeset
|
174 do { |
11691
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
175 uint64_t v = AV_RN64A(dst) | lut[*buf++]; |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
176 AV_WN64A(dst, v); |
11692 | 177 dst += 8; |
11717
269ce565c70b
Move a while(..){..} -> do{..}while(..), slightly faster.
rbultje
parents:
11700
diff
changeset
|
178 } while (--buf_size); |
11660 | 179 } |
180 | |
181 /** | |
182 * Decode interleaved plane buffer up to 24bpp | |
11175 | 183 * @param dst Destination buffer |
184 * @param buf Source buffer | |
185 * @param buf_size | |
186 * @param plane plane number to decode as | |
11074 | 187 */ |
11700 | 188 static void decodeplane32(uint32_t *dst, const uint8_t *buf, int buf_size, int plane) |
11660 | 189 { |
11700 | 190 const uint32_t *lut = plane32_lut[plane]; |
191 do { | |
192 unsigned mask = (*buf >> 2) & ~3; | |
193 dst[0] |= lut[mask++]; | |
194 dst[1] |= lut[mask++]; | |
195 dst[2] |= lut[mask++]; | |
196 dst[3] |= lut[mask]; | |
197 mask = (*buf++ << 2) & 0x3F; | |
198 dst[4] |= lut[mask++]; | |
199 dst[5] |= lut[mask++]; | |
200 dst[6] |= lut[mask++]; | |
201 dst[7] |= lut[mask]; | |
202 dst += 8; | |
203 } while (--buf_size); | |
11074 | 204 } |
205 | |
206 static int decode_frame_ilbm(AVCodecContext *avctx, | |
207 void *data, int *data_size, | |
208 AVPacket *avpkt) | |
209 { | |
11175 | 210 IffContext *s = avctx->priv_data; |
11074 | 211 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
|
212 int buf_size = avpkt->size; |
11187 | 213 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
|
214 int y, plane; |
11074 | 215 |
11175 | 216 if (avctx->reget_buffer(avctx, &s->frame) < 0){ |
11074 | 217 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); |
218 return -1; | |
219 } | |
220 | |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
221 if (avctx->pix_fmt == PIX_FMT_PAL8) { |
11663 | 222 for(y = 0; y < avctx->height; y++ ) { |
223 uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ]; | |
224 memset(row, 0, avctx->width); | |
225 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
|
226 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
|
227 buf += s->planesize; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
228 } |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
229 } |
11663 | 230 } else { // PIX_FMT_BGR32 |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
231 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
|
232 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
|
233 memset(row, 0, avctx->width << 2); |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
234 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
|
235 decodeplane32((uint32_t *) row, buf, FFMIN(s->planesize, buf_end - buf), plane); |
11663 | 236 buf += s->planesize; |
11175 | 237 } |
11074 | 238 } |
239 } | |
240 | |
241 *data_size = sizeof(AVFrame); | |
11175 | 242 *(AVFrame*)data = s->frame; |
11074 | 243 return buf_size; |
244 } | |
245 | |
246 static int decode_frame_byterun1(AVCodecContext *avctx, | |
247 void *data, int *data_size, | |
248 AVPacket *avpkt) | |
249 { | |
11175 | 250 IffContext *s = avctx->priv_data; |
11074 | 251 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
|
252 int buf_size = avpkt->size; |
11074 | 253 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
|
254 int y, plane, x; |
11074 | 255 |
11175 | 256 if (avctx->reget_buffer(avctx, &s->frame) < 0){ |
11074 | 257 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); |
258 return -1; | |
259 } | |
260 | |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
261 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
|
262 if (avctx->pix_fmt == PIX_FMT_PAL8) { |
11663 | 263 for(y = 0; y < avctx->height ; y++ ) { |
264 uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ]; | |
265 memset(row, 0, avctx->width); | |
266 for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) { | |
267 for(x = 0; x < s->planesize && buf < buf_end; ) { | |
268 int8_t value = *buf++; | |
269 unsigned length; | |
270 if (value >= 0) { | |
271 length = value + 1; | |
272 memcpy(s->planebuf + x, buf, FFMIN3(length, s->planesize - x, buf_end - buf)); | |
273 buf += length; | |
274 } else if (value > -128) { | |
275 length = -value + 1; | |
276 memset(s->planebuf + x, *buf++, FFMIN(length, s->planesize - x)); | |
277 } else { //noop | |
278 continue; | |
279 } | |
280 x += length; | |
11074 | 281 } |
11693
3ec57be57312
Remove "bps" parameter to decodeplane8/32(), it's unused.
rbultje
parents:
11692
diff
changeset
|
282 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
|
283 } |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
284 } |
11663 | 285 } else { //PIX_FMT_BGR32 |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
286 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
|
287 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
|
288 memset(row, 0, avctx->width << 2); |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
289 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
|
290 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
|
291 int8_t value = *buf++; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
292 unsigned length; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
293 if (value >= 0) { |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
294 length = value + 1; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
295 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
|
296 buf += length; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
297 } else if (value > -128) { |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
298 length = -value + 1; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
299 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
|
300 } else { // noop |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
301 continue; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
302 } |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
303 x += length; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
304 } |
11693
3ec57be57312
Remove "bps" parameter to decodeplane8/32(), it's unused.
rbultje
parents:
11692
diff
changeset
|
305 decodeplane32((uint32_t *) row, s->planebuf, s->planesize, plane); |
11175 | 306 } |
11074 | 307 } |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
308 } |
11663 | 309 } else { |
310 for(y = 0; y < avctx->height ; y++ ) { | |
311 uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]]; | |
11074 | 312 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
|
313 int8_t value = *buf++; |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
314 unsigned length; |
11074 | 315 if (value >= 0) { |
316 length = value + 1; | |
317 memcpy(row + x, buf, FFMIN3(length, buf_end - buf, avctx->width - x)); | |
318 buf += length; | |
319 } else if (value > -128) { | |
320 length = -value + 1; | |
321 memset(row + x, *buf++, FFMIN(length, avctx->width - x)); | |
322 } else { //noop | |
323 continue; | |
324 } | |
325 x += length; | |
326 } | |
327 } | |
328 } | |
329 | |
330 *data_size = sizeof(AVFrame); | |
11175 | 331 *(AVFrame*)data = s->frame; |
11074 | 332 return buf_size; |
333 } | |
334 | |
335 static av_cold int decode_end(AVCodecContext *avctx) | |
336 { | |
11175 | 337 IffContext *s = avctx->priv_data; |
338 if (s->frame.data[0]) | |
339 avctx->release_buffer(avctx, &s->frame); | |
340 av_freep(&s->planebuf); | |
11074 | 341 return 0; |
342 } | |
343 | |
344 AVCodec iff_ilbm_decoder = { | |
345 "iff_ilbm", | |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
11480
diff
changeset
|
346 AVMEDIA_TYPE_VIDEO, |
11074 | 347 CODEC_ID_IFF_ILBM, |
11175 | 348 sizeof(IffContext), |
11074 | 349 decode_init, |
350 NULL, | |
351 decode_end, | |
352 decode_frame_ilbm, | |
353 CODEC_CAP_DR1, | |
354 .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"), | |
355 }; | |
356 | |
357 AVCodec iff_byterun1_decoder = { | |
358 "iff_byterun1", | |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
11480
diff
changeset
|
359 AVMEDIA_TYPE_VIDEO, |
11074 | 360 CODEC_ID_IFF_BYTERUN1, |
11175 | 361 sizeof(IffContext), |
11074 | 362 decode_init, |
363 NULL, | |
364 decode_end, | |
365 decode_frame_byterun1, | |
366 CODEC_CAP_DR1, | |
367 .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"), | |
368 }; |