annotate iff.c @ 11717:269ce565c70b libavcodec

Move a while(..){..} -> do{..}while(..), slightly faster. Patch by Sebastian Vater <cdgs basty googlemail com>.
author rbultje
date Thu, 13 May 2010 13:18:25 +0000
parents 6bdec2a0e7e1
children f2beca0bbf98
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
1 /*
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
2 * IFF PBM/ILBM bitmap decoder
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
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
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
5 *
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
6 * This file is part of FFmpeg.
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
7 *
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
8 * FFmpeg is free software; you can redistribute it and/or
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
9 * modify it under the terms of the GNU Lesser General Public
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
10 * License as published by the Free Software Foundation; either
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
11 * version 2.1 of the License, or (at your option) any later version.
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
12 *
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
13 * FFmpeg is distributed in the hope that it will be useful,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
16 * Lesser General Public License for more details.
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
17 *
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
18 * You should have received a copy of the GNU Lesser General Public
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
19 * License along with FFmpeg; if not, write to the Free Software
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
21 */
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
22
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
23 /**
11644
7dd2a45249a9 Remove explicit filename from Doxygen @file commands.
diego
parents: 11560
diff changeset
24 * @file
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
25 * IFF PBM/ILBM bitmap decoder
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
26 */
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
27
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
28 #include "bytestream.h"
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
29 #include "avcodec.h"
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
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
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
32
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
33 typedef struct {
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
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
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
36 uint8_t * planebuf;
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
37 } IffContext;
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
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
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
82 #define LUT32(plane) { \
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
83 0, 0, 0, 0, \
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
84 0, 0, 0, 1 << plane, \
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
85 0, 0, 1 << plane, 0, \
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
86 0, 0, 1 << plane, 1 << plane, \
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
87 0, 1 << plane, 0, 0, \
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
88 0, 1 << plane, 0, 1 << plane, \
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
89 0, 1 << plane, 1 << plane, 0, \
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
90 0, 1 << plane, 1 << plane, 1 << plane, \
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
91 1 << plane, 0, 0, 0, \
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
92 1 << plane, 0, 0, 1 << plane, \
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
93 1 << plane, 0, 1 << plane, 0, \
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
94 1 << plane, 0, 1 << plane, 1 << plane, \
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
95 1 << plane, 1 << plane, 0, 0, \
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
96 1 << plane, 1 << plane, 0, 1 << plane, \
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
97 1 << plane, 1 << plane, 1 << plane, 0, \
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
98 1 << plane, 1 << plane, 1 << plane, 1 << plane, \
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
99 }
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
100
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
101 // 32 planes * 4-bit mask * 4 lookup tables each
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
102 static const uint32_t plane32_lut[32][16*4] = {
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
103 LUT32( 0), LUT32( 1), LUT32( 2), LUT32( 3),
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
104 LUT32( 4), LUT32( 5), LUT32( 6), LUT32( 7),
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
105 LUT32( 8), LUT32( 9), LUT32(10), LUT32(11),
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
106 LUT32(12), LUT32(13), LUT32(14), LUT32(15),
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
107 LUT32(16), LUT32(17), LUT32(18), LUT32(19),
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
108 LUT32(20), LUT32(21), LUT32(22), LUT32(23),
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
109 LUT32(24), LUT32(25), LUT32(26), LUT32(27),
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
110 LUT32(28), LUT32(29), LUT32(30), LUT32(31),
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
111 };
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
112
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
113 /**
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
114 * Convert CMAP buffer (stored in extradata) to lavc palette format
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
115 */
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
116 int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal)
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
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
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
119
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
120 if (avctx->bits_per_coded_sample > 8) {
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
121 av_log(avctx, AV_LOG_ERROR, "bit_per_coded_sample > 8 not supported\n");
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
122 return AVERROR_INVALIDDATA;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
123 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
124
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
125 count = 1 << avctx->bits_per_coded_sample;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
126 if (avctx->extradata_size < count * 3) {
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
127 av_log(avctx, AV_LOG_ERROR, "palette data underflow\n");
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
128 return AVERROR_INVALIDDATA;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
129 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
130 for (i=0; i < count; i++) {
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
131 pal[i] = 0xFF000000 | AV_RB24( avctx->extradata + i*3 );
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
132 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
133 return 0;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
134 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
135
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
136 static av_cold int decode_init(AVCodecContext *avctx)
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
137 {
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
138 IffContext *s = avctx->priv_data;
11480
534872e7ab38 Make iff.c:decode_init return the value returned by
stefano
parents: 11395
diff changeset
139 int err;
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
140
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
141 if (avctx->bits_per_coded_sample <= 8) {
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
142 avctx->pix_fmt = PIX_FMT_PAL8;
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
143 } else if (avctx->bits_per_coded_sample <= 32) {
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
144 avctx->pix_fmt = PIX_FMT_BGR32;
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
145 } else {
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
146 return AVERROR_INVALIDDATA;
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
147 }
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
148
11699
83b49b0997e8 Ensure that width and height are > 0. avcodec_open() itself only checks that
rbultje
parents: 11693
diff changeset
149 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
150 return err;
11679
fe1e6103b68d Align plane size to word-boundary.
cehoyos
parents: 11678
diff changeset
151 s->planesize = FFALIGN(avctx->width, 16) >> 3; // Align plane size in bits to word-boundary
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
152 s->planebuf = av_malloc(s->planesize + FF_INPUT_BUFFER_PADDING_SIZE);
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
153 if (!s->planebuf)
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
154 return AVERROR(ENOMEM);
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
155
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
156 s->frame.reference = 1;
11480
534872e7ab38 Make iff.c:decode_init return the value returned by
stefano
parents: 11395
diff changeset
157 if ((err = avctx->get_buffer(avctx, &s->frame) < 0)) {
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
158 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
159 return err;
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
160 }
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
161
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
162 return avctx->bits_per_coded_sample <= 8 ?
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
163 ff_cmap_read_palette(avctx, (uint32_t*)s->frame.data[1]) : 0;
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
164 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
165
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
166 /**
11660
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
167 * Decode interleaved plane buffer up to 8bpp
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
168 * @param dst Destination buffer
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
169 * @param buf Source buffer
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
170 * @param buf_size
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
171 * @param plane plane number to decode as
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
172 */
11693
3ec57be57312 Remove "bps" parameter to decodeplane8/32(), it's unused.
rbultje
parents: 11692
diff changeset
173 static void decodeplane8(uint8_t *dst, const uint8_t *buf, int buf_size, int plane)
11660
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
174 {
11691
24827da9c8dc Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents: 11679
diff changeset
175 const uint64_t *lut = plane8_lut[plane];
11717
269ce565c70b Move a while(..){..} -> do{..}while(..), slightly faster.
rbultje
parents: 11700
diff changeset
176 do {
11691
24827da9c8dc Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents: 11679
diff changeset
177 uint64_t v = AV_RN64A(dst) | lut[*buf++];
24827da9c8dc Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
rbultje
parents: 11679
diff changeset
178 AV_WN64A(dst, v);
11692
5eb6d3cbf257 IFF: decode last 8 pixels per line
mru
parents: 11691
diff changeset
179 dst += 8;
11717
269ce565c70b Move a while(..){..} -> do{..}while(..), slightly faster.
rbultje
parents: 11700
diff changeset
180 } while (--buf_size);
11660
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
181 }
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
182
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
183 /**
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
184 * Decode interleaved plane buffer up to 24bpp
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
185 * @param dst Destination buffer
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
186 * @param buf Source buffer
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
187 * @param buf_size
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
188 * @param plane plane number to decode as
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
189 */
11700
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
190 static void decodeplane32(uint32_t *dst, const uint8_t *buf, int buf_size, int plane)
11660
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
191 {
11700
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
192 const uint32_t *lut = plane32_lut[plane];
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
193 do {
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
194 unsigned mask = (*buf >> 2) & ~3;
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
195 dst[0] |= lut[mask++];
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
196 dst[1] |= lut[mask++];
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
197 dst[2] |= lut[mask++];
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
198 dst[3] |= lut[mask];
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
199 mask = (*buf++ << 2) & 0x3F;
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
200 dst[4] |= lut[mask++];
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
201 dst[5] |= lut[mask++];
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
202 dst[6] |= lut[mask++];
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
203 dst[7] |= lut[mask];
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
204 dst += 8;
6bdec2a0e7e1 Optimize decodeplane32().
rbultje
parents: 11699
diff changeset
205 } while (--buf_size);
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
206 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
207
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
208 static int decode_frame_ilbm(AVCodecContext *avctx,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
209 void *data, int *data_size,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
210 AVPacket *avpkt)
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
211 {
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
212 IffContext *s = avctx->priv_data;
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
213 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
214 int buf_size = avpkt->size;
11187
a4c6587e2c27 Support <8-bit ILBM uncompressed bitmaps
pross
parents: 11175
diff changeset
215 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
216 int y, plane;
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
217
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
218 if (avctx->reget_buffer(avctx, &s->frame) < 0){
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
219 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
220 return -1;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
221 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
222
11662
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
223 if (avctx->pix_fmt == PIX_FMT_PAL8) {
11663
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
224 for(y = 0; y < avctx->height; y++ ) {
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
225 uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ];
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
226 memset(row, 0, avctx->width);
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
227 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
228 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
229 buf += s->planesize;
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
230 }
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
231 }
11663
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
232 } else { // PIX_FMT_BGR32
11662
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
233 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
234 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
235 memset(row, 0, avctx->width << 2);
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
236 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
237 decodeplane32((uint32_t *) row, buf, FFMIN(s->planesize, buf_end - buf), plane);
11663
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
238 buf += s->planesize;
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
239 }
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
240 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
241 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
242
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
243 *data_size = sizeof(AVFrame);
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
244 *(AVFrame*)data = s->frame;
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
245 return buf_size;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
246 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
247
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
248 static int decode_frame_byterun1(AVCodecContext *avctx,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
249 void *data, int *data_size,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
250 AVPacket *avpkt)
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
251 {
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
252 IffContext *s = avctx->priv_data;
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
253 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
254 int buf_size = avpkt->size;
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
255 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
256 int y, plane, x;
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
257
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
258 if (avctx->reget_buffer(avctx, &s->frame) < 0){
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
259 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
260 return -1;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
261 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
262
11662
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
263 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
264 if (avctx->pix_fmt == PIX_FMT_PAL8) {
11663
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
265 for(y = 0; y < avctx->height ; y++ ) {
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
266 uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ];
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
267 memset(row, 0, avctx->width);
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
268 for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) {
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
269 for(x = 0; x < s->planesize && buf < buf_end; ) {
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
270 int8_t value = *buf++;
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
271 unsigned length;
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
272 if (value >= 0) {
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
273 length = value + 1;
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
274 memcpy(s->planebuf + x, buf, FFMIN3(length, s->planesize - x, buf_end - buf));
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
275 buf += length;
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
276 } else if (value > -128) {
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
277 length = -value + 1;
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
278 memset(s->planebuf + x, *buf++, FFMIN(length, s->planesize - x));
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
279 } else { //noop
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
280 continue;
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
281 }
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
282 x += length;
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
283 }
11693
3ec57be57312 Remove "bps" parameter to decodeplane8/32(), it's unused.
rbultje
parents: 11692
diff changeset
284 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
285 }
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
286 }
11663
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
287 } else { //PIX_FMT_BGR32
11662
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
288 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
289 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
290 memset(row, 0, avctx->width << 2);
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
291 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
292 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
293 int8_t value = *buf++;
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
294 unsigned length;
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
295 if (value >= 0) {
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
296 length = value + 1;
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
297 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
298 buf += length;
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
299 } else if (value > -128) {
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
300 length = -value + 1;
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
301 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
302 } else { // noop
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
303 continue;
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
304 }
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
305 x += length;
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
306 }
11693
3ec57be57312 Remove "bps" parameter to decodeplane8/32(), it's unused.
rbultje
parents: 11692
diff changeset
307 decodeplane32((uint32_t *) row, s->planebuf, s->planesize, plane);
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
308 }
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
309 }
11662
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
310 }
11663
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
311 } else {
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
312 for(y = 0; y < avctx->height ; y++ ) {
2c69c6015a84 Reidnent after r22795.
rbultje
parents: 11662
diff changeset
313 uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]];
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
314 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
315 int8_t value = *buf++;
11661
7a5f3c94b9ad Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents: 11660
diff changeset
316 unsigned length;
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
317 if (value >= 0) {
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
318 length = value + 1;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
319 memcpy(row + x, buf, FFMIN3(length, buf_end - buf, avctx->width - x));
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
320 buf += length;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
321 } else if (value > -128) {
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
322 length = -value + 1;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
323 memset(row + x, *buf++, FFMIN(length, avctx->width - x));
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
324 } else { //noop
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
325 continue;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
326 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
327 x += length;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
328 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
329 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
330 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
331
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
332 *data_size = sizeof(AVFrame);
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
333 *(AVFrame*)data = s->frame;
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
334 return buf_size;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
335 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
336
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
337 static av_cold int decode_end(AVCodecContext *avctx)
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
338 {
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
339 IffContext *s = avctx->priv_data;
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
340 if (s->frame.data[0])
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
341 avctx->release_buffer(avctx, &s->frame);
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
342 av_freep(&s->planebuf);
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
343 return 0;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
344 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
345
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
346 AVCodec iff_ilbm_decoder = {
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
347 "iff_ilbm",
11560
8a4984c5cacc Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 11480
diff changeset
348 AVMEDIA_TYPE_VIDEO,
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
349 CODEC_ID_IFF_ILBM,
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
350 sizeof(IffContext),
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
351 decode_init,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
352 NULL,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
353 decode_end,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
354 decode_frame_ilbm,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
355 CODEC_CAP_DR1,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
356 .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"),
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
357 };
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
358
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
359 AVCodec iff_byterun1_decoder = {
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
360 "iff_byterun1",
11560
8a4984c5cacc Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 11480
diff changeset
361 AVMEDIA_TYPE_VIDEO,
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
362 CODEC_ID_IFF_BYTERUN1,
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
363 sizeof(IffContext),
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
364 decode_init,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
365 NULL,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
366 decode_end,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
367 decode_frame_byterun1,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
368 CODEC_CAP_DR1,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
369 .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"),
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
370 };