Mercurial > libavcodec.hg
annotate iff.c @ 11691:24827da9c8dc libavcodec
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
author | rbultje |
---|---|
date | Sat, 08 May 2010 21:48:44 +0000 |
parents | fe1e6103b68d |
children | 5eb6d3cbf257 |
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 |
11679 | 118 s->planesize = FFALIGN(avctx->width, 16) >> 3; // Align plane size in bits to word-boundary |
11175 | 119 s->planebuf = av_malloc(s->planesize + FF_INPUT_BUFFER_PADDING_SIZE); |
120 if (!s->planebuf) | |
121 return AVERROR(ENOMEM); | |
122 | |
123 s->frame.reference = 1; | |
11480
534872e7ab38
Make iff.c:decode_init return the value returned by
stefano
parents:
11395
diff
changeset
|
124 if ((err = avctx->get_buffer(avctx, &s->frame) < 0)) { |
11074 | 125 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
|
126 return err; |
11074 | 127 } |
11175 | 128 |
129 return avctx->bits_per_coded_sample <= 8 ? | |
130 ff_cmap_read_palette(avctx, (uint32_t*)s->frame.data[1]) : 0; | |
11074 | 131 } |
132 | |
133 /** | |
11660 | 134 * Decode interleaved plane buffer up to 8bpp |
135 * @param dst Destination buffer | |
136 * @param buf Source buffer | |
137 * @param buf_size | |
138 * @param bps bits_per_coded_sample (must be <= 8) | |
139 * @param plane plane number to decode as | |
140 */ | |
11691
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
141 static void decodeplane8(uint8_t *dst, const uint8_t *buf, int buf_size, int bps, int plane) |
11660 | 142 { |
11691
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
143 const uint64_t *lut = plane8_lut[plane]; |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
144 for(; --buf_size != 0; dst += 8) { |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
145 uint64_t v = AV_RN64A(dst) | lut[*buf++]; |
24827da9c8dc
Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents:
11679
diff
changeset
|
146 AV_WN64A(dst, v); |
11660 | 147 } |
148 } | |
149 | |
150 /** | |
151 * Decode interleaved plane buffer up to 24bpp | |
11175 | 152 * @param dst Destination buffer |
153 * @param buf Source buffer | |
154 * @param buf_size | |
155 * @param bps bits_per_coded_sample | |
156 * @param plane plane number to decode as | |
11074 | 157 */ |
11660 | 158 static void decodeplane32(uint32_t *dst, const uint8_t *const buf, int buf_size, int bps, int plane) |
159 { | |
160 GetBitContext gb; | |
11678
e1dd1ff1ab27
Revert r22974 int->unsigned parts that don't have any meaningful effect.
rbultje
parents:
11663
diff
changeset
|
161 int i; |
11679 | 162 const int b = buf_size * 8; |
11660 | 163 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
|
164 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
|
165 dst[i] |= get_bits1(&gb) << plane; |
11660 | 166 } |
11074 | 167 } |
168 | |
169 static int decode_frame_ilbm(AVCodecContext *avctx, | |
170 void *data, int *data_size, | |
171 AVPacket *avpkt) | |
172 { | |
11175 | 173 IffContext *s = avctx->priv_data; |
11074 | 174 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
|
175 int buf_size = avpkt->size; |
11187 | 176 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
|
177 int y, plane; |
11074 | 178 |
11175 | 179 if (avctx->reget_buffer(avctx, &s->frame) < 0){ |
11074 | 180 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); |
181 return -1; | |
182 } | |
183 | |
11662
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) { |
11663 | 185 for(y = 0; y < avctx->height; y++ ) { |
186 uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ]; | |
187 memset(row, 0, avctx->width); | |
188 for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) { | |
11187 | 189 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
|
190 buf += s->planesize; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
191 } |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
192 } |
11663 | 193 } else { // PIX_FMT_BGR32 |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
194 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
|
195 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
|
196 memset(row, 0, avctx->width << 2); |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
197 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
|
198 decodeplane32((uint32_t *) row, buf, FFMIN(s->planesize, buf_end - buf), avctx->bits_per_coded_sample, plane); |
11663 | 199 buf += s->planesize; |
11175 | 200 } |
11074 | 201 } |
202 } | |
203 | |
204 *data_size = sizeof(AVFrame); | |
11175 | 205 *(AVFrame*)data = s->frame; |
11074 | 206 return buf_size; |
207 } | |
208 | |
209 static int decode_frame_byterun1(AVCodecContext *avctx, | |
210 void *data, int *data_size, | |
211 AVPacket *avpkt) | |
212 { | |
11175 | 213 IffContext *s = avctx->priv_data; |
11074 | 214 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
|
215 int buf_size = avpkt->size; |
11074 | 216 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
|
217 int y, plane, x; |
11074 | 218 |
11175 | 219 if (avctx->reget_buffer(avctx, &s->frame) < 0){ |
11074 | 220 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); |
221 return -1; | |
222 } | |
223 | |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
224 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
|
225 if (avctx->pix_fmt == PIX_FMT_PAL8) { |
11663 | 226 for(y = 0; y < avctx->height ; y++ ) { |
227 uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ]; | |
228 memset(row, 0, avctx->width); | |
229 for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) { | |
230 for(x = 0; x < s->planesize && buf < buf_end; ) { | |
231 int8_t value = *buf++; | |
232 unsigned length; | |
233 if (value >= 0) { | |
234 length = value + 1; | |
235 memcpy(s->planebuf + x, buf, FFMIN3(length, s->planesize - x, buf_end - buf)); | |
236 buf += length; | |
237 } else if (value > -128) { | |
238 length = -value + 1; | |
239 memset(s->planebuf + x, *buf++, FFMIN(length, s->planesize - x)); | |
240 } else { //noop | |
241 continue; | |
242 } | |
243 x += length; | |
11074 | 244 } |
11175 | 245 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
|
246 } |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
247 } |
11663 | 248 } else { //PIX_FMT_BGR32 |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
249 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
|
250 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
|
251 memset(row, 0, avctx->width << 2); |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
252 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
|
253 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
|
254 int8_t value = *buf++; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
255 unsigned length; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
256 if (value >= 0) { |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
257 length = value + 1; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
258 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
|
259 buf += length; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
260 } else if (value > -128) { |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
261 length = -value + 1; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
262 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
|
263 } else { // noop |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
264 continue; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
265 } |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
266 x += length; |
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
267 } |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
268 decodeplane32((uint32_t *) row, s->planebuf, s->planesize, avctx->bits_per_coded_sample, plane); |
11175 | 269 } |
11074 | 270 } |
11662
33e4b0d712c8
Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents:
11661
diff
changeset
|
271 } |
11663 | 272 } else { |
273 for(y = 0; y < avctx->height ; y++ ) { | |
274 uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]]; | |
11074 | 275 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
|
276 int8_t value = *buf++; |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
277 unsigned length; |
11074 | 278 if (value >= 0) { |
279 length = value + 1; | |
280 memcpy(row + x, buf, FFMIN3(length, buf_end - buf, avctx->width - x)); | |
281 buf += length; | |
282 } else if (value > -128) { | |
283 length = -value + 1; | |
284 memset(row + x, *buf++, FFMIN(length, avctx->width - x)); | |
285 } else { //noop | |
286 continue; | |
287 } | |
288 x += length; | |
289 } | |
290 } | |
291 } | |
292 | |
293 *data_size = sizeof(AVFrame); | |
11175 | 294 *(AVFrame*)data = s->frame; |
11074 | 295 return buf_size; |
296 } | |
297 | |
298 static av_cold int decode_end(AVCodecContext *avctx) | |
299 { | |
11175 | 300 IffContext *s = avctx->priv_data; |
301 if (s->frame.data[0]) | |
302 avctx->release_buffer(avctx, &s->frame); | |
303 av_freep(&s->planebuf); | |
11074 | 304 return 0; |
305 } | |
306 | |
307 AVCodec iff_ilbm_decoder = { | |
308 "iff_ilbm", | |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
11480
diff
changeset
|
309 AVMEDIA_TYPE_VIDEO, |
11074 | 310 CODEC_ID_IFF_ILBM, |
11175 | 311 sizeof(IffContext), |
11074 | 312 decode_init, |
313 NULL, | |
314 decode_end, | |
315 decode_frame_ilbm, | |
316 CODEC_CAP_DR1, | |
317 .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"), | |
318 }; | |
319 | |
320 AVCodec iff_byterun1_decoder = { | |
321 "iff_byterun1", | |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
11480
diff
changeset
|
322 AVMEDIA_TYPE_VIDEO, |
11074 | 323 CODEC_ID_IFF_BYTERUN1, |
11175 | 324 sizeof(IffContext), |
11074 | 325 decode_init, |
326 NULL, | |
327 decode_end, | |
328 decode_frame_byterun1, | |
329 CODEC_CAP_DR1, | |
330 .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"), | |
331 }; |