annotate iff.c @ 11662:33e4b0d712c8 libavcodec

Move some branches outside looped code. Should improve the generated asm (and thus performance) slightly. Patch by Sebastian Vater <cdgs.basty googlemail com>.
author rbultje
date Mon, 26 Apr 2010 22:38:41 +0000
parents 7a5f3c94b9ad
children 2c69c6015a84
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;
11661
7a5f3c94b9ad Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents: 11660
diff changeset
35 unsigned 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
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
39 /**
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
40 * Convert CMAP buffer (stored in extradata) to lavc palette format
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
41 */
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
42 int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal)
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
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
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
45
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
46 if (avctx->bits_per_coded_sample > 8) {
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
47 av_log(avctx, AV_LOG_ERROR, "bit_per_coded_sample > 8 not supported\n");
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
48 return AVERROR_INVALIDDATA;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
49 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
50
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
51 count = 1 << avctx->bits_per_coded_sample;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
52 if (avctx->extradata_size < count * 3) {
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
53 av_log(avctx, AV_LOG_ERROR, "palette data underflow\n");
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
54 return AVERROR_INVALIDDATA;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
55 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
56 for (i=0; i < count; i++) {
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
57 pal[i] = 0xFF000000 | AV_RB24( avctx->extradata + i*3 );
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
58 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
59 return 0;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
60 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
61
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
62 static av_cold int decode_init(AVCodecContext *avctx)
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
63 {
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
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
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
66
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
67 if (avctx->bits_per_coded_sample <= 8) {
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
68 avctx->pix_fmt = PIX_FMT_PAL8;
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
69 } else if (avctx->bits_per_coded_sample <= 32) {
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
70 avctx->pix_fmt = PIX_FMT_BGR32;
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
71 } else {
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
72 return AVERROR_INVALIDDATA;
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
73 }
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
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
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
76 s->planebuf = av_malloc(s->planesize + FF_INPUT_BUFFER_PADDING_SIZE);
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
77 if (!s->planebuf)
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
78 return AVERROR(ENOMEM);
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
79
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
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
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
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
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
84 }
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
85
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
86 return avctx->bits_per_coded_sample <= 8 ?
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
87 ff_cmap_read_palette(avctx, (uint32_t*)s->frame.data[1]) : 0;
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
88 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
89
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
90 /**
11660
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
91 * Decode interleaved plane buffer up to 8bpp
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
92 * @param dst Destination buffer
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
93 * @param buf Source buffer
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
94 * @param buf_size
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
95 * @param bps bits_per_coded_sample (must be <= 8)
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
96 * @param plane plane number to decode as
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
97 */
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
98 static void decodeplane8(uint8_t *dst, const uint8_t *const buf, int buf_size, int bps, int plane)
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
99 {
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
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
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
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
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
106 }
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
107 }
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
108
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
109 /**
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
110 * Decode interleaved plane buffer up to 24bpp
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
111 * @param dst Destination buffer
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
112 * @param buf Source buffer
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
113 * @param buf_size
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
114 * @param bps bits_per_coded_sample
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
115 * @param plane plane number to decode as
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
116 */
11660
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
117 static void decodeplane32(uint32_t *dst, const uint8_t *const buf, int buf_size, int bps, int plane)
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
118 {
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
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
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
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
dd10b0c7d0de Make two functions out of #define hackery.
cehoyos
parents: 11644
diff changeset
125 }
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
126 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
127
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
128 static int decode_frame_ilbm(AVCodecContext *avctx,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
129 void *data, int *data_size,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
130 AVPacket *avpkt)
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
131 {
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
132 IffContext *s = avctx->priv_data;
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
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
a4c6587e2c27 Support <8-bit ILBM uncompressed bitmaps
pross
parents: 11175
diff changeset
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
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 if (avctx->reget_buffer(avctx, &s->frame) < 0){
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
139 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
140 return -1;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
141 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
142
11662
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
143 if (avctx->pix_fmt == PIX_FMT_PAL8) {
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
144 for(y = 0; y < avctx->height; y++ ) {
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
145 uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ];
11662
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
146 memset(row, 0, avctx->width);
11187
a4c6587e2c27 Support <8-bit ILBM uncompressed bitmaps
pross
parents: 11175
diff changeset
147 for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) {
a4c6587e2c27 Support <8-bit ILBM uncompressed bitmaps
pross
parents: 11175
diff changeset
148 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
149 buf += s->planesize;
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
150 }
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
151 }
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
152 } else { // PIX_FMT_BGR32
11662
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
153 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
154 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
155 memset(row, 0, avctx->width << 2);
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
156 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
157 decodeplane32((uint32_t *) 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
158 buf += s->planesize;
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
159 }
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
160 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
161 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
162
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
163 *data_size = sizeof(AVFrame);
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
164 *(AVFrame*)data = s->frame;
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
165 return buf_size;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
166 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
167
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
168 static int decode_frame_byterun1(AVCodecContext *avctx,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
169 void *data, int *data_size,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
170 AVPacket *avpkt)
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
171 {
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
172 IffContext *s = avctx->priv_data;
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
173 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
174 unsigned buf_size = avpkt->size;
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
175 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
176 unsigned y, plane, x;
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
177
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
178 if (avctx->reget_buffer(avctx, &s->frame) < 0){
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
179 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
180 return -1;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
181 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
182
11662
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
183 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
184 if (avctx->pix_fmt == PIX_FMT_PAL8) {
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
185 for(y = 0; y < avctx->height ; y++ ) {
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
186 uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ];
11662
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
187 memset(row, 0, avctx->width);
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
188 for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) {
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
189 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
190 int8_t value = *buf++;
11661
7a5f3c94b9ad Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents: 11660
diff changeset
191 unsigned length;
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
192 if (value >= 0) {
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
193 length = value + 1;
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
194 memcpy(s->planebuf + x, buf, FFMIN3(length, s->planesize - x, buf_end - buf));
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
195 buf += length;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
196 } else if (value > -128) {
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
197 length = -value + 1;
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
198 memset(s->planebuf + x, *buf++, FFMIN(length, s->planesize - x));
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
199 } else { //noop
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
200 continue;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
201 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
202 x += length;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
203 }
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
204 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
205 }
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
206 }
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
207 } else { //PIX_FMT_BGR32
11662
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
208 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
209 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
210 memset(row, 0, avctx->width << 2);
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
211 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
212 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
213 int8_t value = *buf++;
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
214 unsigned length;
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
215 if (value >= 0) {
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
216 length = value + 1;
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
217 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
218 buf += length;
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
219 } else if (value > -128) {
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
220 length = -value + 1;
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
221 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
222 } else { // noop
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
223 continue;
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
224 }
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
225 x += length;
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
226 }
11661
7a5f3c94b9ad Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents: 11660
diff changeset
227 decodeplane32((uint32_t *) row, s->planebuf, s->planesize, avctx->bits_per_coded_sample, plane);
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
228 }
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
229 }
11662
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
230 }
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
231 } else {
11662
33e4b0d712c8 Move some branches outside looped code. Should improve the generated asm (and
rbultje
parents: 11661
diff changeset
232 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
233 uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]];
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
234 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
235 int8_t value = *buf++;
11661
7a5f3c94b9ad Switch some ints to unsigned (they can only have positive values, this allows
rbultje
parents: 11660
diff changeset
236 unsigned length;
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
237 if (value >= 0) {
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
238 length = value + 1;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
239 memcpy(row + x, buf, FFMIN3(length, buf_end - buf, avctx->width - x));
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
240 buf += length;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
241 } else if (value > -128) {
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
242 length = -value + 1;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
243 memset(row + x, *buf++, FFMIN(length, avctx->width - x));
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
244 } else { //noop
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
245 continue;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
246 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
247 x += length;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
248 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
249 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
250 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
251
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
252 *data_size = sizeof(AVFrame);
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
253 *(AVFrame*)data = s->frame;
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
254 return buf_size;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
255 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
256
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
257 static av_cold int decode_end(AVCodecContext *avctx)
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
258 {
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
259 IffContext *s = avctx->priv_data;
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
260 if (s->frame.data[0])
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
261 avctx->release_buffer(avctx, &s->frame);
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
262 av_freep(&s->planebuf);
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
263 return 0;
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
264 }
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
265
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
266 AVCodec iff_ilbm_decoder = {
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
267 "iff_ilbm",
11560
8a4984c5cacc Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 11480
diff changeset
268 AVMEDIA_TYPE_VIDEO,
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
269 CODEC_ID_IFF_ILBM,
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
270 sizeof(IffContext),
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
271 decode_init,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
272 NULL,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
273 decode_end,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
274 decode_frame_ilbm,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
275 CODEC_CAP_DR1,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
276 .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"),
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
277 };
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
278
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
279 AVCodec iff_byterun1_decoder = {
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
280 "iff_byterun1",
11560
8a4984c5cacc Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 11480
diff changeset
281 AVMEDIA_TYPE_VIDEO,
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
282 CODEC_ID_IFF_BYTERUN1,
11175
30856cadb01b IFF bitmap n-bit color support
pross
parents: 11124
diff changeset
283 sizeof(IffContext),
11074
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
284 decode_init,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
285 NULL,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
286 decode_end,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
287 decode_frame_byterun1,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
288 CODEC_CAP_DR1,
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
289 .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"),
9fe3b0dcd33d IFF PBM/ILBM bitmap decoder
pross
parents:
diff changeset
290 };