Mercurial > libavcodec.hg
annotate iff.c @ 11661:7a5f3c94b9ad libavcodec
Switch some ints to unsigned (they can only have positive values, this allows
compiler to optimize some math from mul/div to shr/shl). Also add a cast to
uint32_t when calling decodeplane32(), this silences a compiler warning.
Lastly, in decodeplane8/32(), flatten a double-loop into a single-loop and
calculate the length once before entering the loop instead of during every
iteration (since it doesn't change).
Patch by Sebastian Vater <cdgs.basty googlemail com>.
author | rbultje |
---|---|
date | Mon, 26 Apr 2010 22:37:13 +0000 |
parents | dd10b0c7d0de |
children | 33e4b0d712c8 |
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 | |
143 for(y = 0; y < avctx->height; y++ ) { | |
11175 | 144 uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ]; |
145 memset(row, 0, avctx->pix_fmt == PIX_FMT_PAL8 ? avctx->width : (avctx->width * 4)); | |
11187 | 146 for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) { |
11175 | 147 if (avctx->pix_fmt == PIX_FMT_PAL8) { |
11187 | 148 decodeplane8(row, buf, FFMIN(s->planesize, buf_end - buf), avctx->bits_per_coded_sample, plane); |
11175 | 149 } else { // PIX_FMT_BGR32 |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
150 decodeplane32((uint32_t *) row, buf, FFMIN(s->planesize, buf_end - buf), avctx->bits_per_coded_sample, plane); |
11175 | 151 } |
152 buf += s->planesize; | |
11074 | 153 } |
154 } | |
155 | |
156 *data_size = sizeof(AVFrame); | |
11175 | 157 *(AVFrame*)data = s->frame; |
11074 | 158 return buf_size; |
159 } | |
160 | |
161 static int decode_frame_byterun1(AVCodecContext *avctx, | |
162 void *data, int *data_size, | |
163 AVPacket *avpkt) | |
164 { | |
11175 | 165 IffContext *s = avctx->priv_data; |
11074 | 166 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
|
167 unsigned buf_size = avpkt->size; |
11074 | 168 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
|
169 unsigned y, plane, x; |
11074 | 170 |
11175 | 171 if (avctx->reget_buffer(avctx, &s->frame) < 0){ |
11074 | 172 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); |
173 return -1; | |
174 } | |
175 | |
176 for(y = 0; y < avctx->height ; y++ ) { | |
11175 | 177 uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ]; |
11074 | 178 if (avctx->codec_tag == MKTAG('I','L','B','M')) { //interleaved |
11175 | 179 memset(row, 0, avctx->pix_fmt == PIX_FMT_PAL8 ? avctx->width : (avctx->width * 4)); |
11074 | 180 for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) { |
11175 | 181 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
|
182 int8_t value = *buf++; |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
183 unsigned length; |
11074 | 184 if (value >= 0) { |
185 length = value + 1; | |
11175 | 186 memcpy(s->planebuf + x, buf, FFMIN3(length, s->planesize - x, buf_end - buf)); |
11074 | 187 buf += length; |
188 } else if (value > -128) { | |
189 length = -value + 1; | |
11175 | 190 memset(s->planebuf + x, *buf++, FFMIN(length, s->planesize - x)); |
11074 | 191 } else { //noop |
192 continue; | |
193 } | |
194 x += length; | |
195 } | |
11175 | 196 if (avctx->pix_fmt == PIX_FMT_PAL8) { |
197 decodeplane8(row, s->planebuf, s->planesize, avctx->bits_per_coded_sample, plane); | |
198 } else { //PIX_FMT_BGR32 | |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
199 decodeplane32((uint32_t *) row, s->planebuf, s->planesize, avctx->bits_per_coded_sample, plane); |
11175 | 200 } |
11074 | 201 } |
202 } else { | |
203 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
|
204 int8_t value = *buf++; |
11661
7a5f3c94b9ad
Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents:
11660
diff
changeset
|
205 unsigned length; |
11074 | 206 if (value >= 0) { |
207 length = value + 1; | |
208 memcpy(row + x, buf, FFMIN3(length, buf_end - buf, avctx->width - x)); | |
209 buf += length; | |
210 } else if (value > -128) { | |
211 length = -value + 1; | |
212 memset(row + x, *buf++, FFMIN(length, avctx->width - x)); | |
213 } else { //noop | |
214 continue; | |
215 } | |
216 x += length; | |
217 } | |
218 } | |
219 } | |
220 | |
221 *data_size = sizeof(AVFrame); | |
11175 | 222 *(AVFrame*)data = s->frame; |
11074 | 223 return buf_size; |
224 } | |
225 | |
226 static av_cold int decode_end(AVCodecContext *avctx) | |
227 { | |
11175 | 228 IffContext *s = avctx->priv_data; |
229 if (s->frame.data[0]) | |
230 avctx->release_buffer(avctx, &s->frame); | |
231 av_freep(&s->planebuf); | |
11074 | 232 return 0; |
233 } | |
234 | |
235 AVCodec iff_ilbm_decoder = { | |
236 "iff_ilbm", | |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
11480
diff
changeset
|
237 AVMEDIA_TYPE_VIDEO, |
11074 | 238 CODEC_ID_IFF_ILBM, |
11175 | 239 sizeof(IffContext), |
11074 | 240 decode_init, |
241 NULL, | |
242 decode_end, | |
243 decode_frame_ilbm, | |
244 CODEC_CAP_DR1, | |
245 .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"), | |
246 }; | |
247 | |
248 AVCodec iff_byterun1_decoder = { | |
249 "iff_byterun1", | |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
11480
diff
changeset
|
250 AVMEDIA_TYPE_VIDEO, |
11074 | 251 CODEC_ID_IFF_BYTERUN1, |
11175 | 252 sizeof(IffContext), |
11074 | 253 decode_init, |
254 NULL, | |
255 decode_end, | |
256 decode_frame_byterun1, | |
257 CODEC_CAP_DR1, | |
258 .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"), | |
259 }; |